diff --git a/configure.ac b/configure.ac
index c232422e6..5e308cc9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -302,6 +302,11 @@ AC_ARG_ENABLE(dynamicdemux,
 	AS_HELP_STRING([--enable-dynamicdemux], [enable dynamic demux @<:@default=no@:>@]),
 	AC_DEFINE(DYNAMIC_DEMUX, 1, [enable dynamic demux]))
 
+AC_ARG_ENABLE(quadpip,
+	AS_HELP_STRING([--enable-quadpip], [enable quad picture in picture support @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_QUADPIP, 1, [enable quad picture in picture support]))
+AM_CONDITIONAL(ENABLE_QUADPIP, test "$enable_quadpip" = "yes")
+
 AC_ARG_ENABLE(testing,
 	AS_HELP_STRING([--enable-testing], [enable development code @<:@default=no@:>@]),
 	AC_DEFINE(ENABLE_TESTING, 1, [enable development code]))
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index aee83d156..53c8da651 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -82,7 +82,6 @@ libneutrino_gui_a_SOURCES = \
 	personalize.cpp \
 	pictureviewer.cpp \
 	pictureviewer_setup.cpp \
-	pipsetup.cpp \
 	pluginlist.cpp \
 	plugins.cpp \
 	proxyserver_setup.cpp \
@@ -114,6 +113,15 @@ libneutrino_gui_a_SOURCES = \
 	xmltv_setup.cpp \
 	zapit_setup.cpp
 
+if ENABLE_PIP
+libneutrino_gui_a_SOURCES += \
+	pipsetup.cpp
+if ENABLE_QUADPIP
+libneutrino_gui_a_SOURCES += \
+	quadpip_setup.cpp
+endif
+endif
+
 if ENABLE_PKG_MANAGEMENT
 libneutrino_gui_a_SOURCES += \
 	opkg_manager.cpp \