diff --git a/README.md b/README.md
index cd2be86..065f8f0 100644
--- a/README.md
+++ b/README.md
@@ -107,7 +107,6 @@ Other options to pass to autogen.sh are
     --disable-metacity         disable Metacity support
     --disable-unity            disable Unity support
     --disable-xfwm             disable XFWM support
-    --disable-xfce-notify      disable XFCE Notify support
 
     --with-gnome=<version>     build the theme for a specific Gnome version (3.14, 3.16, 3.18, 3.20)
                                Note: Normally the correct version is detected automatically and this
diff --git a/common/Makefile.am b/common/Makefile.am
index 7966da8..c603f5c 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -247,12 +247,6 @@ endif # ENABLE_DARK
 endif # ENABLE_UNITY
 
 
-if ENABLE_XFCE_NOTIFY
-	$(MKDIR_P) $(ithemedir)
-	cp -R $(srcdir)/xfce-notify-4.0 $(ithemedir)
-endif # ENABLE_XFCE_NOTIFY
-
-
 if ENABLE_XFWM
 
 if ENABLE_LIGHT
@@ -288,7 +282,6 @@ EXTRA_DIST = $(srcdir)/cinnamon \
 	     $(srcdir)/gtk-3.0 \
 	     $(srcdir)/metacity-1 \
 	     $(srcdir)/unity \
-	     $(srcdir)/xfce-notify-4.0 \
 	     $(srcdir)/xfwm4 \
 	     $(srcdir)/xfwm4-dark \
 	     $(srcdir)/index.theme \
diff --git a/common/gtk-2.0/gtkrc b/common/gtk-2.0/gtkrc
index 60e5559..8d54f3b 100644
--- a/common/gtk-2.0/gtkrc
+++ b/common/gtk-2.0/gtkrc
@@ -20,4 +20,5 @@ gtk-primary-button-warps-slider = 1
 include "main.rc"
 include "apps.rc"
 include "panel.rc"
+include "xfce-notify.rc"
 include "menubar-toolbar/menubar-toolbar.rc"
diff --git a/common/gtk-2.0/gtkrc-dark b/common/gtk-2.0/gtkrc-dark
index 51e1285..9f85145 100644
--- a/common/gtk-2.0/gtkrc-dark
+++ b/common/gtk-2.0/gtkrc-dark
@@ -20,4 +20,5 @@ gtk-primary-button-warps-slider = 1
 include "main.rc"
 include "apps.rc"
 include "panel.rc"
+include "xfce-notify.rc"
 include "menubar-toolbar/menubar-toolbar-dark.rc"
diff --git a/common/gtk-2.0/gtkrc-darker b/common/gtk-2.0/gtkrc-darker
index 3c933f1..73dbfcb 100644
--- a/common/gtk-2.0/gtkrc-darker
+++ b/common/gtk-2.0/gtkrc-darker
@@ -20,4 +20,5 @@ gtk-primary-button-warps-slider = 1
 include "main.rc"
 include "apps.rc"
 include "panel.rc"
+include "xfce-notify.rc"
 include "menubar-toolbar/menubar-toolbar-dark.rc"
diff --git a/common/xfce-notify-4.0/gtkrc b/common/gtk-2.0/xfce-notify.rc
similarity index 100%
rename from common/xfce-notify-4.0/gtkrc
rename to common/gtk-2.0/xfce-notify.rc
diff --git a/configure.ac b/configure.ac
index eb1f431..a77f31a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,6 @@ ARC_ENABLE([GTK3],          [gtk3],          [GTK3],          [disable])
 ARC_ENABLE([METACITY],      [metacity],      [Metacity],      [disable])
 ARC_ENABLE([UNITY],         [unity],         [Unity],         [disable])
 ARC_ENABLE([XFWM],          [xfwm],          [XFWM],          [disable])
-ARC_ENABLE([XFCE_NOTIFY],   [xfce-notify],   [XFCE Notify],   [disable])
 ARC_ENABLE([TRANSPARENCY],  [transparency],  [transparency],  [disable])
 
 ARC_GNOME