diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile
new file mode 100644
index 00000000..6d6bb171
--- /dev/null
+++ b/osmo-mgw-master/Dockerfile
@@ -0,0 +1,37 @@
+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 --no-install-recommends \
+		telnet \
+		libosmocore-dev \
+		libosmo-abis-dev \
+		libosmo-netif-dev \
+		libosmo-sccp-dev && \
+	apt-get clean
+
+WORKDIR	/tmp
+
+RUN	git clone git://git.osmocom.org/osmo-mgw.git
+ADD	http://git.osmocom.org/osmo-mgw/patch /tmp/commit-osmo-mgw
+
+RUN	cd osmo-mgw && \
+	git fetch && git checkout -f -B master origin/master && \
+	autoreconf -fi && \
+	./configure && \
+	make -j8 install && \
+	ldconfig
+
+VOLUME	/data
+
+COPY	osmo-mgw.cfg /data/osmo-mgw.cfg
+
+WORKDIR	/data
+CMD	["/usr/local/bin/osmo-mgw"]
diff --git a/osmo-mgw-master/Makefile b/osmo-mgw-master/Makefile
new file mode 100644
index 00000000..dc9b67be
--- /dev/null
+++ b/osmo-mgw-master/Makefile
@@ -0,0 +1,3 @@
+RUN_ARGS?=--rm --network sigtran --ip 172.18.0.180 -v mgw-vol:/data
+
+include ../make/Makefile
diff --git a/osmo-mgw-master/Release.key b/osmo-mgw-master/Release.key
new file mode 100644
index 00000000..07f1a4fd
--- /dev/null
+++ b/osmo-mgw-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-----
diff --git a/osmo-mgw-master/osmo-mgw.cfg b/osmo-mgw-master/osmo-mgw.cfg
new file mode 100644
index 00000000..4bdde6b1
--- /dev/null
+++ b/osmo-mgw-master/osmo-mgw.cfg
@@ -0,0 +1,52 @@
+!
+! OsmoMGW (1.2.0.17-52e3) configuration saved from vty
+!!
+!
+log stderr
+  logging filter all 1
+  logging color 1
+  logging print category 1
+  logging timestamp 0
+  logging level all everything
+  logging level rtp notice
+  logging level lglobal notice
+  logging level llapd notice
+  logging level linp notice
+  logging level lmux notice
+  logging level lmi notice
+  logging level lmib notice
+  logging level lsms notice
+  logging level lctrl notice
+  logging level lgtp notice
+  logging level lstats notice
+  logging level lgsup notice
+  logging level loap notice
+  logging level lss7 notice
+  logging level lsccp notice
+  logging level lsua notice
+  logging level lm3ua notice
+  logging level lmgcp debug
+!
+stats interval 5
+!
+line vty
+ no login
+!
+mgcp
+  bind ip 172.18.0.180
+  bind port 2427
+  rtp port-range 4002 16000
+  rtp bind-ip 172.18.0.180
+  rtp ip-probing
+  rtp ip-dscp 184
+  no rtp keep-alive
+  no rtcp-omit
+  no rtp-patch
+  sdp audio-payload number 98
+  sdp audio-payload name GSM
+  sdp audio-payload send-ptime
+  sdp audio-payload send-name
+  loop 0
+  number endpoints 31
+  allow-transcoding
+  osmux off