diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 10a30213446..6431a1b7df0 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -140,6 +140,7 @@ MOZ_UPDATER	= @MOZ_UPDATER@
 MOZ_UPDATE_PACKAGING	= @MOZ_UPDATE_PACKAGING@
 MOZ_NO_ACTIVEX_SUPPORT = @MOZ_NO_ACTIVEX_SUPPORT@
 MOZ_ACTIVEX_SCRIPTING_SUPPORT = @MOZ_ACTIVEX_SCRIPTING_SUPPORT@
+MOZ_DISABLE_PARENTAL_CONTROLS = @MOZ_DISABLE_PARENTAL_CONTROLS@
 XPC_IDISPATCH_SUPPORT = @XPC_IDISPATCH_SUPPORT@
 MOZ_SPELLCHECK = @MOZ_SPELLCHECK@
 MOZ_XPFE_COMPONENTS = @MOZ_XPFE_COMPONENTS@
diff --git a/configure.in b/configure.in
index b27046b3e9b..ba82207e064 100644
--- a/configure.in
+++ b/configure.in
@@ -5782,6 +5782,19 @@ MOZ_ARG_DISABLE_BOOL(tests,
     ENABLE_TESTS=,
     ENABLE_TESTS=1 )
 
+dnl ========================================================
+dnl parental controls (for Windows Vista)
+dnl ========================================================
+MOZ_ARG_DISABLE_BOOL(parental-controls,
+[  --disable-parental-controls
+                           Do not build parental controls],
+   MOZ_DISABLE_PARENTAL_CONTROLS=1,
+   MOZ_DISABLE_PARENTAL_CONTROLS=)
+if test -n "$MOZ_DISABLE_PARENTAL_CONTROLS"; then
+    AC_DEFINE(MOZ_DISABLE_PARENTAL_CONTROLS)
+fi
+AC_SUBST(MOZ_DISABLE_PARENTAL_CONTROLS)
+
 dnl ========================================================
 dnl =
 dnl = Module specific options