diff --git a/configure.ac b/configure.ac
index 15f5d3d..1305b62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -233,17 +233,23 @@ fi
 AM_CONDITIONAL(PK_BUILD_MANAGED, test $build_managed = "yes")
 
 dnl ---------------------------------------------------------------------------
-dnl - libarchive
-dnl ---------------------------------------------------------------------------
-AC_CHECK_HEADERS(archive.h,
-		 HAVE_ARCHIVE_H="yes",
-		 HAVE_ARCHIVE_H="no")
-if test "x$HAVE_ARCHIVE_H" = "xyes"; then
-		AC_DEFINE(HAVE_ARCHIVE_H)
-		ARCHIVE_LIBS=-larchive
-		AC_SUBST(ARCHIVE_LIBS)
+dnl - Service Packs
+dnl ---------------------------------------------------------------------------
+AC_ARG_ENABLE(service-packs, AC_HELP_STRING([--enable-service-packs],[Enable Service Packs]),
+	      enable_servicepacks=$enableval,enable_servicepacks=false)
+if test x$enable_servicepacks = xyes; then
+	AC_CHECK_HEADERS(archive.h,
+			 HAVE_ARCHIVE_H="yes",
+			 HAVE_ARCHIVE_H="no")
+	if test "x$HAVE_ARCHIVE_H" = "xyes"; then
+			AC_DEFINE(HAVE_ARCHIVE_H)
+			ARCHIVE_LIBS=-larchive
+			AC_SUBST(ARCHIVE_LIBS)
+	else
+			AC_MSG_ERROR([Service Packs support need libarchive])
+	fi
 else
-		AC_MSG_WARN([Cannot find archive.h. Service packs cannot be created or checked.])
+	HAVE_ARCHIVE_H="no"
 fi
 AM_CONDITIONAL(HAVE_ARCHIVE_H, test x$HAVE_ARCHIVE_H = xyes)
 
@@ -268,12 +274,18 @@ AC_PATH_PROG([MOC], [moc-qt4])
 networking_apis="unix"
 
 dnl ---------------------------------------------------------------------------
-dnl - Is NetworkManager available?
+dnl - NetworkManager
 dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(LIBNM, libnm_glib >= $LIBNM_GLIB_REQUIRED, PK_BUILD_NETWORKMANAGER="yes", PK_BUILD_NETWORKMANAGER="no")
-if test "x$PK_BUILD_NETWORKMANAGER" = "xyes"; then
-	networking_apis="${networking_apis},NetworkManager"
-	AC_DEFINE(PK_BUILD_NETWORKMANAGER, 1, [define if NetworkManager is installed])
+AC_ARG_ENABLE(networkmanager, AC_HELP_STRING([--enable-networkmanager],[Enable NetworkManager]),
+	      enable_networkmanager=$enableval,enable_networkmanager=false)
+if test x$enable_networkmanager = xyes; then
+	PKG_CHECK_MODULES(LIBNM, libnm_glib >= $LIBNM_GLIB_REQUIRED, PK_BUILD_NETWORKMANAGER="yes", PK_BUILD_NETWORKMANAGER="no")
+	if test "x$PK_BUILD_NETWORKMANAGER" = "xyes"; then
+		networking_apis="${networking_apis},NetworkManager"
+		AC_DEFINE(PK_BUILD_NETWORKMANAGER, 1, [define if NetworkManager is installed])
+	else
+		AC_MSG_ERROR([NetworkManager enabled but not found])
+	fi
 else
 	PK_BUILD_NETWORKMANAGER=no
 fi