diff --git a/.gitignore b/.gitignore
index 701bb079..8153e385 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,5 +17,5 @@ dist
 *.egg-info
 docs/_*/*
 docs/autodoc/
-build/sphinx/
+build
 pyan/
diff --git a/build/changelang.sh b/build/changelang.sh
deleted file mode 100755
index 915c5dea..00000000
--- a/build/changelang.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-export LANG=de_DE.UTF-8
-export LANGUAGE=de_DE
-export LC_CTYPE="de_DE.UTF-8"
-export LC_NUMERIC=de_DE.UTF-8
-export LC_TIME=de_DE.UTF-8
-export LC_COLLATE="de_DE.UTF-8"
-export LC_MONETARY=de_DE.UTF-8
-export LC_MESSAGES="de_DE.UTF-8"
-export LC_PAPER=de_DE.UTF-8
-export LC_NAME=de_DE.UTF-8
-export LC_ADDRESS=de_DE.UTF-8
-export LC_TELEPHONE=de_DE.UTF-8
-export LC_MEASUREMENT=de_DE.UTF-8
-export LC_IDENTIFICATION=de_DE.UTF-8
-export LC_ALL=
-python2.7 src/bitmessagemain.py
diff --git a/build/compiletest.py b/build/compiletest.py
deleted file mode 100755
index fdbf7db1..00000000
--- a/build/compiletest.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/python2.7
-
-import ctypes
-import fnmatch
-import os
-import sys
-import traceback
-
-matches = []
-for root, dirnames, filenames in os.walk('src'):
-    for filename in fnmatch.filter(filenames, '*.py'):
-        matches.append(os.path.join(root, filename))
-
-for filename in matches:
-    source = open(filename, 'r').read() + '\n'
-    try:
-        compile(source, filename, 'exec')
-    except Exception as e:
-        if 'win' in sys.platform:
-            ctypes.windll.user32.MessageBoxA(0, traceback.format_exc(), "Exception in " + filename, 1)
-        else:
-            print "Exception in %s: %s" % (filename, traceback.format_exc())
-        sys.exit(1)
diff --git a/build/mergepullrequest.sh b/build/mergepullrequest.sh
deleted file mode 100755
index 35e87566..00000000
--- a/build/mergepullrequest.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-if [ -z "$1" ]; then
-	echo "You must specify pull request number"
-	exit
-fi
-
-git pull
-git checkout v0.6
-git fetch origin pull/"$1"/head:"$1"
-git merge --ff-only "$1"
diff --git a/build/README.md b/buildscripts/README.md
similarity index 100%
rename from build/README.md
rename to buildscripts/README.md
diff --git a/build/osx.sh b/buildscripts/osx.sh
similarity index 100%
rename from build/osx.sh
rename to buildscripts/osx.sh
diff --git a/build/updatetranslations.sh b/buildscripts/updatetranslations.sh
similarity index 100%
rename from build/updatetranslations.sh
rename to buildscripts/updatetranslations.sh