diff --git a/Makefile.config.in b/Makefile.config.in
index 2f042bf8..14f1a53e 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -138,7 +138,7 @@ CONFIG_OS2 = @CONFIG_OS2@
 CONFIG_OWN_LIBC = @CONFIG_OWN_LIBC@
 CONFIG_SCRIPTING_PERL = @CONFIG_SCRIPTING_PERL@
 CONFIG_POD2HTML = @CONFIG_POD2HTML@
-CONFIG_PYTHON = @CONFIG_PYTHON@
+CONFIG_SCRIPTING_PYTHON = @CONFIG_SCRIPTING_PYTHON@
 CONFIG_RISCOS = @CONFIG_RISCOS@
 CONFIG_SCRIPTING_RUBY = @CONFIG_SCRIPTING_RUBY@
 CONFIG_SCANNER = @CONFIG_SCANNER@
diff --git a/configure.in b/configure.in
index 97740c20..bdc61091 100644
--- a/configure.in
+++ b/configure.in
@@ -773,7 +773,7 @@ fi
 if test "$cf_result" != "yes"; then
 	EL_RESTORE_FLAGS
 else
-	EL_CONFIG(CONFIG_PYTHON, [Python])
+	EL_CONFIG(CONFIG_SCRIPTING_PYTHON, [Python])
 
 	CFLAGS="$CFLAGS_X"
 	AC_SUBST(PYTHON_LIBS)
@@ -855,11 +855,11 @@ dnl ===================================================================
 dnl Setup global scripting
 dnl ===================================================================
 
-EL_CONFIG_DEPENDS(CONFIG_SCRIPTING, [CONFIG_SCRIPTING_GUILE CONFIG_SCRIPTING_LUA CONFIG_SCRIPTING_PERL CONFIG_PYTHON CONFIG_SCRIPTING_RUBY CONFIG_SM_SCRIPTING], [Browser scripting])
+EL_CONFIG_DEPENDS(CONFIG_SCRIPTING, [CONFIG_SCRIPTING_GUILE CONFIG_SCRIPTING_LUA CONFIG_SCRIPTING_PERL CONFIG_SCRIPTING_PYTHON CONFIG_SCRIPTING_RUBY CONFIG_SM_SCRIPTING], [Browser scripting])
 AC_SUBST(CONFIG_SCRIPTING_GUILE)
 AC_SUBST(CONFIG_SCRIPTING_LUA)
 AC_SUBST(CONFIG_SCRIPTING_PERL)
-AC_SUBST(CONFIG_PYTHON)
+AC_SUBST(CONFIG_SCRIPTING_PYTHON)
 AC_SUBST(CONFIG_SCRIPTING_RUBY)
 AC_SUBST(CONFIG_SM_SCRIPTING)
 AC_SUBST(CONFIG_SCRIPTING)
diff --git a/src/scripting/Makefile b/src/scripting/Makefile
index 053f54b6..162fee44 100644
--- a/src/scripting/Makefile
+++ b/src/scripting/Makefile
@@ -4,7 +4,7 @@ include $(top_builddir)/Makefile.config
 SUBDIRS-$(CONFIG_SCRIPTING_GUILE)		+= guile
 SUBDIRS-$(CONFIG_SCRIPTING_LUA)		+= lua
 SUBDIRS-$(CONFIG_SCRIPTING_PERL)		+= perl
-SUBDIRS-$(CONFIG_PYTHON)	+= python
+SUBDIRS-$(CONFIG_SCRIPTING_PYTHON)	+= python
 SUBDIRS-$(CONFIG_SCRIPTING_RUBY)		+= ruby
 SUBDIRS-$(CONFIG_SM_SCRIPTING)	+= smjs
 
diff --git a/src/scripting/scripting.c b/src/scripting/scripting.c
index ad06f3e0..5593ebd4 100644
--- a/src/scripting/scripting.c
+++ b/src/scripting/scripting.c
@@ -71,7 +71,7 @@ static struct module *scripting_modules[] = {
 #ifdef CONFIG_SCRIPTING_PERL
 	&perl_scripting_module,
 #endif
-#ifdef CONFIG_PYTHON
+#ifdef CONFIG_SCRIPTING_PYTHON
 	&python_scripting_module,
 #endif
 #ifdef CONFIG_SCRIPTING_RUBY