diff --git a/.gitignore b/.gitignore
index 887c209..5da57b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@
 /modulemd-2.2.1.tar.xz
 /modulemd-2.2.2.tar.xz
 /modulemd-2.2.3.tar.xz
+/modulemd-2.3.0.tar.xz
diff --git a/0001-Fix-accidental-ABI-break.patch b/0001-Fix-accidental-ABI-break.patch
deleted file mode 100644
index f9f91a5..0000000
--- a/0001-Fix-accidental-ABI-break.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From bf5c2f76f6d4fe8510e8a2e1b24db72c5b53c846 Mon Sep 17 00:00:00 2001
-From: Stephen Gallagher <sgallagh@redhat.com>
-Date: Wed, 3 Apr 2019 08:54:19 -0400
-Subject: [PATCH] Fix accidental ABI break
-
-When we added the .equals() functions for ModulemdDefaults and
-ModulemdComponent, we did not decrease the padding value, which
-resulted in the structure being enlarged.
-
-Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
----
- modulemd/v2/include/modulemd-2.0/modulemd-defaults.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modulemd/v2/include/modulemd-2.0/modulemd-defaults.h b/modulemd/v2/include/modulemd-2.0/modulemd-defaults.h
-index 4794c2f65ea1990f5dc36c80df0804e0320b7730..5da77fb2aead0f8b2c5e8d9dd667a4aaca526d52 100644
---- a/modulemd/v2/include/modulemd-2.0/modulemd-defaults.h
-+++ b/modulemd/v2/include/modulemd-2.0/modulemd-defaults.h
-@@ -63,13 +63,13 @@ struct _ModulemdDefaultsClass
- 
-   guint64 (*get_mdversion) (ModulemdDefaults *self);
- 
-   gboolean (*equals) (ModulemdDefaults *self_1, ModulemdDefaults *self_2);
- 
--  /* Padding to allow adding up to 10 new virtual functions without
-+  /* Padding to allow adding up to 9 new virtual functions without
-    * breaking ABI. */
--  gpointer padding[10];
-+  gpointer padding[9];
- };
- 
- 
- /**
-  * modulemd_defaults_new:
--- 
-2.21.0
-
diff --git a/libmodulemd.spec b/libmodulemd.spec
index 5e49a68..d819cd7 100644
--- a/libmodulemd.spec
+++ b/libmodulemd.spec
@@ -1,5 +1,5 @@
-%global libmodulemd_version 2.2.3
-%global libmodulemd_v1_version 1.8.6
+%global libmodulemd_version 2.3.0
+%global libmodulemd_v1_version 1.8.7
 
 # Python 2 is dead on F31+
 %if 0%{fedora} < 31
@@ -12,7 +12,7 @@
 
 Name:           libmodulemd
 Version:        %{libmodulemd_version}
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        Module metadata manipulation library
 
 License:        MIT
@@ -42,7 +42,6 @@ Conflicts:      libmodulemd1 < %{libmodulemd_v1_version}-%{release}
 
 
 # Patches
-Patch0001: 0001-Fix-accidental-ABI-break.patch
 
 
 %description
@@ -56,10 +55,11 @@ more details.
 Summary: Python 2 bindings for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: python-gobject-base
+Requires: python-six
 Obsoletes: python2-modulemd < 1.3.4
 
 %description -n python2-%{name}
-Python 3 bindings for %{name}
+Python 2 bindings for %{name}
 %endif
 
 
@@ -67,6 +67,7 @@ Python 3 bindings for %{name}
 Summary: Python 3 bindings for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: python3-gobject-base
+Requires: %{py3_dist six}
 Obsoletes: python3-modulemd < 1.3.4
 
 %description -n python3-%{name}
@@ -230,6 +231,15 @@ ln -s libmodulemd.so.%{libmodulemd_v1_version} \
 %{_datadir}/gtk-doc/html/modulemd-1.0/
 
 %changelog
+* Mon Apr 22 2019 Stephen Gallagher <sgallagh@redhat.com> - 2.3.0-1
+- Add ModuleIndex.update_from_custom()
+- Add ModuleIndex.dump_to_custom()
+- Add Component.equals()
+- Add Module.remove_streams_by_NSVCA()
+- Fix bug with emitting lists of scalars in XMD
+- Fix bug with deduplication in the ModuleIndexMerger
+- Fix serious memory leak
+
 * Tue Apr 16 2019 Adam Williamson <awilliam@redhat.com> - 2.2.3-3
 - Rebuild with Meson fix for #1699099
 
diff --git a/sources b/sources
index 8769dca..a035103 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (modulemd-2.2.3.tar.xz) = 5a8313c95279c76c01bd0b07e4fe766eff988e44ca0d4f439f163854ba942c0bf4e881043371eb08da12826f6b54224039cd55a59220c3aefab438deaf457664
+SHA512 (modulemd-2.3.0.tar.xz) = b34328332c14175616e18c8c74750d5e77fca2b502c31d94242cb496d414ab9642ec5b88fc7a4232229d9c6b386589a11cacb4df5c2288a968fc116e80294dd4