diff --git a/capplets/common/wrapper-script.in b/capplets/common/wrapper-script.in
new file mode 100644
index 000000000..c28048d75
--- /dev/null
+++ b/capplets/common/wrapper-script.in
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if test "x$#" == "x0"
+then
+    @BINDIR@/gnomecc --run-capplet @CAPPLET_NAME@
+else
+    @BINDIR@/@CAPPLET_NAME@-control $@
+fi
+