diff --git a/configure.ac b/configure.ac
index 8f81870c..c28f71da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -308,9 +308,12 @@ AC_LINK_IFELSE(
 	)],
 	[AC_DEFINE([HAVE_SET_DEFAULT_ICON_NAME], 1,
 	           [Define to 1 if gtkmm-2.4 provides Gtk::Window::set_default_icon_name() method.])
+	 AM_CONDITIONAL([INSTALL_PIXMAPS_DIR], false)
 	 AC_MSG_RESULT([yes])
 	],
-	[AC_MSG_RESULT([no])]
+	[AM_CONDITIONAL([INSTALL_PIXMAPS_DIR], true)
+	 AC_MSG_RESULT([no])
+        ]
 )
 CXXFLAGS="$CXXFLAGS_save"
 AC_LANG_POP([C++])
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 01f9b899..9572d171 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -36,6 +36,12 @@ EXTRA_DIST = \
 	$(noinst_DATA)		\
 	$(NULL)
 
+# Only install fallback icon to /usr/share/pixmaps if required
+if INSTALL_PIXMAPS_DIR
+INSTALL_PIXMAP   = install-pixmap
+UNINSTALL_PIXMAP = uninstall-pixmap
+endif
+
 ###############################################################################
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t
@@ -94,6 +100,6 @@ install-pixmap:
 uninstall-pixmap:
 	rm -f $(DESTDIR)$(datadir)/pixmaps/gparted.png
 
-install-data-local: install-icons install-pixmap update-icon-cache
+install-data-local: install-icons $(INSTALL_PIXMAP) update-icon-cache
 
-uninstall-local: uninstall-icons uninstall-pixmap update-icon-cache
+uninstall-local: uninstall-icons $(UNINSTALL_PIXMAP) update-icon-cache