diff --git a/.gitignore b/.gitignore
index 3f95ade70..6d19545aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ install_manifest.txt
 /src/Tools/offlinedoc/localwiki/
 /src/Tools/offlinedoc/todolist.txt
 /src/Tools/offlinedoc/wikifiles.txt
+.subuser-dev
diff --git a/.subuser.json b/.subuser.json
new file mode 100644
index 000000000..a004b52ac
--- /dev/null
+++ b/.subuser.json
@@ -0,0 +1 @@
+{"image-sources-dir": "./subuser"}
\ No newline at end of file
diff --git a/subuser/freecad-dev/image/Dockerfile b/subuser/freecad-dev/image/Dockerfile
new file mode 100644
index 000000000..e971bd04e
--- /dev/null
+++ b/subuser/freecad-dev/image/Dockerfile
@@ -0,0 +1,14 @@
+FROM ubuntu:14.04
+RUN apt-get update
+RUN apt-get install -yqq software-properties-common
+RUN add-apt-repository ppa:freecad-maintainers/freecad-daily
+RUN apt-get update
+RUN apt-get install -yqq build-essential python python2.7-dev subversion cmake libtool autotools-dev automake bison flex gfortran git
+RUN apt-get install -yqq libCoin80-dev libCoin80-doc libsoqt4-dev libqt4-dev qt4-dev-tools libsoqt4-dev python-qt4 libqtwebkit-dev
+RUN apt-get install -yqq liboce-foundation-dev liboce-modeling-dev liboce-ocaf-dev liboce-visualization-dev oce-draw
+RUN apt-get install -yqq libode-dev libeigen2-dev libeigen3-dev libsimage-dev libxerces-c2-dev
+RUN apt-get install -yqq libpyside-dev pyside-tools libshiboken-dev doxygen python-pivy
+RUN apt-get install -yqq libboost1.55-all-dev
+RUN apt-get install -yqq libmedc-dev libvtk6-dev libproj-dev
+RUN apt-get install -yqq libxerces-c-dev
+RUN ln -s /usr/lib/x86_64-linux-gnu/libxerces-c.so /usr/lib/libxerces-c.so
diff --git a/subuser/freecad-dev/permissions.json b/subuser/freecad-dev/permissions.json
new file mode 100644
index 000000000..509ee26c6
--- /dev/null
+++ b/subuser/freecad-dev/permissions.json
@@ -0,0 +1,11 @@
+{
+ "maintainer": "Timothy <timothyhobbs@seznam.cz>",
+ "stateful-home": true,
+ "executable": "/bin/bash",
+ "allow-network-access": true,
+ "basic-common-permissions": true,
+ "description": "A development environment for building and running freecad.",
+ "access-working-directory": true,
+ "graphics-card": true,
+ "gui": {"clipboard":true}
+}