diff --git a/fixup_hashtags.php b/scripts/fixup_hashtags.php
similarity index 96%
rename from fixup_hashtags.php
rename to scripts/fixup_hashtags.php
index 04f50afdf8..88f385798d 100755
--- a/fixup_hashtags.php
+++ b/scripts/fixup_hashtags.php
@@ -24,7 +24,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
     exit();
 }
 
-define('INSTALLDIR', dirname(__FILE__));
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 define('LACONICA', true);
 
 require_once(INSTALLDIR . '/lib/common.php');
diff --git a/fixup_notices_rendered.php b/scripts/fixup_notices_rendered.php
similarity index 96%
rename from fixup_notices_rendered.php
rename to scripts/fixup_notices_rendered.php
index 53f9b1b166..7b29f0d235 100755
--- a/fixup_notices_rendered.php
+++ b/scripts/fixup_notices_rendered.php
@@ -24,7 +24,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 	exit();
 }
 
-define('INSTALLDIR', dirname(__FILE__));
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 define('LACONICA', true);
 
 require_once(INSTALLDIR . '/lib/common.php');
diff --git a/fixup_replies.php b/scripts/fixup_replies.php
similarity index 95%
rename from fixup_replies.php
rename to scripts/fixup_replies.php
index 51ecf7afaa..6010e21d11 100755
--- a/fixup_replies.php
+++ b/scripts/fixup_replies.php
@@ -24,7 +24,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
     exit();
 }
 
-define('INSTALLDIR', dirname(__FILE__));
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 define('LACONICA', true);
 
 require_once(INSTALLDIR . '/lib/common.php');
diff --git a/maildaemon.php b/scripts/maildaemon.php
similarity index 98%
rename from maildaemon.php
rename to scripts/maildaemon.php
index 0a96bfeb4d..3d3b309514 100755
--- a/maildaemon.php
+++ b/scripts/maildaemon.php
@@ -24,7 +24,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 	exit();
 }
 
-define('INSTALLDIR', dirname(__FILE__));
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 define('LACONICA', true);
 
 require_once(INSTALLDIR . '/lib/common.php');
diff --git a/sitemap.php b/scripts/sitemap.php
similarity index 99%
rename from sitemap.php
rename to scripts/sitemap.php
index c35a382a01..fbfd14e199 100644
--- a/sitemap.php
+++ b/scripts/sitemap.php
@@ -1,6 +1,6 @@
 <?php
 
-define('INSTALLDIR', dirname(__FILE__));
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 define('LACONICA', true);
 
 require_once(INSTALLDIR . '/lib/common.php');
diff --git a/xmppdaemon.php b/scripts/xmppdaemon.php
similarity index 99%
rename from xmppdaemon.php
rename to scripts/xmppdaemon.php
index 37b349f588..43f2b6aaee 100755
--- a/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -53,7 +53,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 	exit();
 }
 
-define('INSTALLDIR', dirname(__FILE__));
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 define('LACONICA', true);
 
 require_once(INSTALLDIR . '/lib/common.php');