diff --git a/addressbook/gui/Makefile.am b/addressbook/gui/Makefile.am
index 7f08bf4..fb552f2 100644
--- a/addressbook/gui/Makefile.am
+++ b/addressbook/gui/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = merging widgets contact-editor contact-list-editor
+SUBDIRS = widgets contact-editor contact-list-editor
 
 -include $(top_srcdir)/git.mk
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 254af85..c49d01a 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -5,7 +5,7 @@ libecontacteditor_la_CPPFLAGS =				\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/addressbook/			\
-	-I$(top_srcdir)/addressbook/gui/merging		\
+	-I$(top_srcdir)/addressbook/gui/widgets		\
 	-I$(top_srcdir)/widgets/table			\
 	-I$(top_builddir)/shell				\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
@@ -31,7 +31,6 @@ libecontacteditor_la_LIBADD =						\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(top_builddir)/addressbook/util/libeabutil.la			\
 	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la	\
-	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la	\
 	$(top_builddir)/addressbook/printing/libecontactprint.la	\
 	$(top_builddir)/widgets/menus/libmenus.la			\
 	$(EVOLUTION_DATA_SERVER_LIBS)					\
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index bcd3989..7979dc7 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -5,7 +5,7 @@ libecontactlisteditor_la_CPPFLAGS =			\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/addressbook/			\
-	-I$(top_srcdir)/addressbook/gui/merging		\
+	-I$(top_srcdir)/addressbook/gui/widgets		\
 	-I$(top_srcdir)/addressbook/gui/contact-editor	\
 	-I$(top_builddir)/shell				\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 546a218..33afb6d 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -1,7 +1,7 @@
 ruledir = $(privdatadir)
 rule_DATA = addresstypes.xml address_formats.dat countrytransl.map
 
-noinst_LTLIBRARIES = libeabwidgets.la
+privsolib_LTLIBRARIES = libeabwidgets.la
 
 libeabwidgets_la_CPPFLAGS =				\
 	$(AM_CPPFLAGS)					\
@@ -14,7 +14,7 @@ libeabwidgets_la_CPPFLAGS =				\
 	-I$(top_srcdir)/filter				\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/addressbook			\
-	-I$(top_srcdir)/addressbook/gui/merging		\
+	-I$(top_srcdir)/addressbook/gui/widgets		\
 	-I$(top_srcdir)/addressbook/util		\
 	-I$(top_srcdir)/widgets/misc			\
 	-I$(top_builddir)/shell				\
@@ -32,6 +32,10 @@ libeabwidgets_la_SOURCES =			\
 	eab-config.c				\
 	eab-contact-display.c			\
 	eab-contact-display.h			\
+	eab-contact-compare.c			\
+	eab-contact-compare.h			\
+	eab-contact-merging.c			\
+	eab-contact-merging.h			\
 	eab-gui-util.c				\
 	eab-gui-util.h				\
 	e-minicard.c				\
@@ -72,6 +76,8 @@ libeabwidgets_la_LIBADD =					\
 	$(top_builddir)/widgets/menus/libmenus.la		\
 	$(top_builddir)/a11y/libevolution-a11y.la		\
 	$(top_builddir)/e-util/libeutil.la			\
+	$(top_builddir)/addressbook/printing/libecontactprint.la \
+	$(top_builddir)/addressbook/util/libeabutil.la		\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(CHAMPLAIN_LIBS)					\
@@ -82,8 +88,13 @@ dist-hook:
 
 etspec_DATA= e-addressbook-view.etspec
 
+ui_DATA = \
+	eab-contact-duplicate-detected.ui	\
+	eab-contact-commit-duplicate-detected.ui
+
 EXTRA_DIST = 			\
 	$(etspec_DATA)		\
-	$(rule_DATA)
+	$(rule_DATA)		\
+	$(ui_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index 6484b45..aeca41d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1585,7 +1585,6 @@ addressbook/Makefile
 addressbook/gui/Makefile
 addressbook/gui/contact-editor/Makefile
 addressbook/gui/contact-list-editor/Makefile
-addressbook/gui/merging/Makefile
 addressbook/gui/widgets/Makefile
 addressbook/importers/Makefile
 addressbook/printing/Makefile
diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am
index 5757ac2..ea73eb0 100644
--- a/modules/addressbook/Makefile.am
+++ b/modules/addressbook/Makefile.am
@@ -62,7 +62,6 @@ libevolution_module_addressbook_la_LIBADD =			\
 	$(top_builddir)/composer/libcomposer.la			\
 	$(top_builddir)/addressbook/printing/libecontactprint.la \
 	$(top_builddir)/shell/libeshell.la			\
-	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \
 	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \
 	$(top_builddir)/filter/libfilter.la			\
 	$(top_builddir)/addressbook/util/libeabutil.la		\
diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am
index 07b747a..247b2d6 100644
--- a/plugins/vcard-inline/Makefile.am
+++ b/plugins/vcard-inline/Makefile.am
@@ -27,7 +27,6 @@ liborg_gnome_vcard_inline_la_LIBADD =					\
 	$(top_builddir)/mail/libevolution-mail.la			\
 	$(top_builddir)/addressbook/util/libeabutil.la			\
 	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la	\
-	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la	\
 	$(top_builddir)/addressbook/printing/libecontactprint.la	\
 	$(EVOLUTION_DATA_SERVER_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)						\
diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c
index cfe461b..7794ef0 100644
--- a/plugins/vcard-inline/vcard-inline.c
+++ b/plugins/vcard-inline/vcard-inline.c
@@ -28,7 +28,7 @@
 #include <libedataserverui/e-client-utils.h>
 #include <libedataserverui/e-source-selector-dialog.h>
 
-#include "addressbook/gui/merging/eab-contact-merging.h"
+#include "addressbook/gui/widgets/eab-contact-merging.h"
 #include "addressbook/gui/widgets/eab-contact-display.h"
 #include "addressbook/util/eab-book-util.h"
 #include "mail/em-format-hook.h"
