diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8cb0b442..e4e39829 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,5 +48,12 @@ IF(WIN32)
   STRING(REPLACE "/" "\\" _MOO_SOURCE_DIR "${_MOO_SOURCE_DIR}")
   GET_FILENAME_COMPONENT(_MOO_BINARY_DIR ${MOO_BINARY_DIR} ABSOLUTE)
   STRING(REPLACE "/" "\\" _MOO_BINARY_DIR "${_MOO_BINARY_DIR}")
+  SET(_MOO_RUN_HOW "@")
   CONFIGURE_FILE(plat/win32/run-medit.in run-medit.bat)
+  SET(_MOO_RUN_HOW "gdb --args ")
+  CONFIGURE_FILE(plat/win32/run-medit.in run-medit-in-gdb.bat)
 ENDIF(WIN32)
+
+IF(NOT WIN32)
+  INSTALL(PROGRAMS plat/unix/xdg-open plat/unix/xdg-email plat/unix/moo-open-html-help DESTINATION ${MOO_DATA_DIR}/scripts)
+ENDIF(NOT WIN32)
diff --git a/moo/CMakeLists.txt b/moo/CMakeLists.txt
index cbe57153..5764afb5 100644
--- a/moo/CMakeLists.txt
+++ b/moo/CMakeLists.txt
@@ -96,7 +96,3 @@ IF(MOO_BUILD_SHARED_LIB)
 ELSE(MOO_BUILD_SHARED_LIB)
   ADD_LIBRARY(moo STATIC ${moo_all_sources})
 ENDIF(MOO_BUILD_SHARED_LIB)
-
-IF(NOT WIN32)
-  INSTALL(PROGRAMS xdg-utils/xdg-open xdg-utils/xdg-email moo-open-html-help DESTINATION ${MOO_DATA_DIR}/scripts)
-ENDIF(NOT WIN32)
diff --git a/moo/moo-open-html-help b/plat/unix/moo-open-html-help
old mode 100755
new mode 100644
similarity index 100%
rename from moo/moo-open-html-help
rename to plat/unix/moo-open-html-help
diff --git a/moo/xdg-utils/xdg-email b/plat/unix/xdg-email
old mode 100755
new mode 100644
similarity index 100%
rename from moo/xdg-utils/xdg-email
rename to plat/unix/xdg-email
diff --git a/moo/xdg-utils/xdg-open b/plat/unix/xdg-open
old mode 100755
new mode 100644
similarity index 100%
rename from moo/xdg-utils/xdg-open
rename to plat/unix/xdg-open
diff --git a/plat/win32/run-medit.in b/plat/win32/run-medit.in
index e39b6b47..88e7761d 100644
--- a/plat/win32/run-medit.in
+++ b/plat/win32/run-medit.in
@@ -1,3 +1,3 @@
 @pushd ${_MOO_BINARY_DIR}\moo
-@${_MOO_BINARY_DIR}\medit\medit.exe -n --log-window %1 %2 %3 %4 %5 %6 %7 %8 %9
+${_MOO_RUN_HOW}${_MOO_BINARY_DIR}\medit\medit.exe -n --log-window %1 %2 %3 %4 %5 %6 %7 %8 %9
 @popd