diff --git a/osmo-virtphy-master/.release b/osmo-virtphy-master/.release
new file mode 100644
index 00000000..8be66cba
--- /dev/null
+++ b/osmo-virtphy-master/.release
@@ -0,0 +1,2 @@
+release=0.0.0
+tag=osmo-virtphy-master-0.0.0
diff --git a/osmo-virtphy-master/Dockerfile b/osmo-virtphy-master/Dockerfile
new file mode 100644
index 00000000..8c9dab70
--- /dev/null
+++ b/osmo-virtphy-master/Dockerfile
@@ -0,0 +1,36 @@
+FROM laforge/debian-jessie-build
+
+MAINTAINER Harald Welte <laforge@gnumonks.org>
+
+COPY	Release.key /tmp/Release.key
+
+RUN	apt-key add /tmp/Release.key && \
+	rm /tmp/Release.key && \
+	echo "deb http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/ ./" > /etc/apt/sources.list.d/osmocom-nightly.list
+
+RUN	apt-get update && apt-get install -y \
+	telnet \
+	libosmocore-dev \
+	libosmo-abis-dev \
+	libosmo-netif-dev \
+	libosmo-sccp-dev \
+	libsmpp34-dev \
+	libgtp-dev
+
+WORKDIR	/tmp
+
+RUN	git clone git://git.osmocom.org/osmocom-bb.git
+ADD	http://git.osmocom.org/osmocom-bb/patch /tmp/commit
+
+RUN	cd osmocom-bb/src/host/virt_phy && \
+	git fetch && git checkout -f -B master origin/master && \
+	autoreconf -fi && \
+	./configure && \
+	make -j8 install
+
+VOLUME	/data
+
+WORKDIR	/data
+CMD	["/usr/local/sbin/virtphy","-s","/data/osmocom_l2"]
+
+#EXPOSE	3002/tcp 3003/tcp 4242/tcp 2775/tcp 4249/tcp
diff --git a/osmo-virtphy-master/Makefile b/osmo-virtphy-master/Makefile
new file mode 100644
index 00000000..2aba67b7
--- /dev/null
+++ b/osmo-virtphy-master/Makefile
@@ -0,0 +1,3 @@
+RUN_ARGS?=--rm --network sigtran --ip 172.18.0.231 -v virtphy-vol:/data
+
+include ../make/Makefile
diff --git a/osmo-virtphy-master/Release.key b/osmo-virtphy-master/Release.key
new file mode 100644
index 00000000..07f1a4fd
--- /dev/null
+++ b/osmo-virtphy-master/Release.key
@@ -0,0 +1,20 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc
+a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl
+CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4
+5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee
+S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y
+CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy
+b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCVlbg
+vgIbAwUJCDPYwgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fKpsH
++wcLqrk927aVs37n8xHHUpLCPiB215zB1p/uS/ZJtWuvY17caZX9kCIkQJhlVfyH
+ObUJOiJkllAHhbybsCCAShB2COyf9q78y/x9hx2VMOI0nSznowuk5CYnWB3NNd/y
+jC+FKw2Q+6+WRoODYodQPgCaBGp9Ptl2MFUots+NnMzhxlDUWL14WG7D/4IqK5TW
+IJRrk4YCDtcl5jx9Zt2evf99CqJqZg+GsfESzd4reHjJBokHqz5wOXTGuOpJroAZ
+KPztGvm/ltA3qYfZy6rlREpTE/GQxeXv6c8w+Zz82CeDYouzArTEr4qc+RD36TZt
+IUpbkm7ZOzHDFrLNx/1YCv6IRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v
+d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=
+=XdMN
+-----END PGP PUBLIC KEY BLOCK-----