diff --git a/configure.ac b/configure.ac
index 3c118fc..90fb749 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,6 +109,7 @@ then
 	# even if we don't need them.
 	# Sorry if that might be confusing %-)
 
+	AC_CHECK_FUNCS([strndup strrchr strstr])
 	# Save LIBS value and clear the variable, AC_CHECK_LIB will append all libs to LIBS on success.
 	LIBS_SAVED=$LIBS
 	LIBS=
@@ -130,6 +131,15 @@ then
 	TINT2CONF_CFLAGS="$(${PKG_CONFIG} --cflags gtk+-x11-2.0 glib-2.0 gobject-2.0 gthread-2.0)"
 	AC_SUBST(TINT2CONF_CFLAGS)
 	AC_SUBST(TINT2CONF_LIBS)
+
+	# Python stuff
+	AC_PATH_PROG([__PYTHON], [python])
+	if test -z "${__PYTHON}";
+	then
+		AC_MSG_ERROR([tint2conf requires python to be installed])
+	fi
+
+	PKG_CHECK_EXISTS([pygtk-2.0],,[AC_MSG_ERROR([tint2conf requires >=pygtk-2.0])])
 fi
 #
 
diff --git a/src/tint2conf/Makefile.am b/src/tint2conf/Makefile.am
index baf4a59..f921d7c 100644
--- a/src/tint2conf/Makefile.am
+++ b/src/tint2conf/Makefile.am
@@ -1,5 +1,6 @@
 if ENABLE_TINT2CONF
 bin_PROGRAMS = tint2conf
+dist_bin_SCRIPTS = tintwizard.py
 tint2conf_SOURCES = main.c ../util/common.c
 INCLUDES = -I../util