diff --git a/osmo-smlc-master/Dockerfile b/osmo-smlc-master/Dockerfile
new file mode 100644
index 00000000..94ab33d2
--- /dev/null
+++ b/osmo-smlc-master/Dockerfile
@@ -0,0 +1,67 @@
+ARG	USER
+ARG	DISTRO
+FROM	$USER/$DISTRO-build
+# Arguments used after FROM must be specified again
+ARG	DISTRO
+
+MAINTAINER Harald Welte <laforge@gnumonks.org>
+
+ARG	OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/"
+
+COPY	Release.key /tmp/Release.key
+
+RUN	case "$DISTRO" in \
+	debian*) \
+		apt-key add /tmp/Release.key && \
+		rm /tmp/Release.key && \
+		echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list \
+		;; \
+	esac
+
+ADD	$OSMOCOM_REPO/Release /tmp/Release
+RUN	case "$DISTRO" in \
+	debian*) \
+		apt-get update && \
+		apt-get install -y --no-install-recommends \
+			telnet \
+			libosmocore-dev \
+			libosmo-netif-dev \
+			libosmo-sccp-dev \
+			libosmo-sigtran-dev && \
+		apt-get clean \
+		;; \
+	centos*) \
+		dnf install -y \
+			"pkgconfig(libosmo-netif)" \
+			"pkgconfig(libosmo-sccp)" \
+			"pkgconfig(libosmo-sigtran)" \
+			"pkgconfig(libosmocore)" \
+			"pkgconfig(libosmoctrl)" \
+			"pkgconfig(libosmogsm)" \
+			"pkgconfig(libosmovty)" \
+		;; \
+	esac
+
+WORKDIR	/tmp
+
+ARG	OSMO_SMLC_BRANCH="master"
+
+RUN	git clone git://git.osmocom.org/osmo-smlc.git
+ADD	http://git.osmocom.org/osmo-smlc/patch?h=$OSMO_SMLC_BRANCH /tmp/commit-osmo-smlc
+
+RUN	cd osmo-smlc && \
+	git fetch && git checkout $OSMO_SMLC_BRANCH && \
+	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_SMLC_BRANCH || exit 1); \
+	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
+	autoreconf -fi && \
+	./configure && \
+	make "-j$(nproc)" install
+
+VOLUME	/data
+
+COPY	osmo-smlc.cfg /data/osmo-smlc.cfg
+
+WORKDIR	/data
+CMD	["/bin/sh", "-c", "/usr/local/bin/osmo-smlc -c /data/osmo-smlc.cfg >/data/osmo-smlc.log 2>&1"]
+
+#EXPOSE
diff --git a/osmo-smlc-master/Makefile b/osmo-smlc-master/Makefile
new file mode 100644
index 00000000..af827f66
--- /dev/null
+++ b/osmo-smlc-master/Makefile
@@ -0,0 +1,3 @@
+RUN_ARGS?=--rm --network sigtran --ip 172.18.0.20 -v bsc-vol:/data
+
+include ../make/Makefile
diff --git a/osmo-smlc-master/Release.key b/osmo-smlc-master/Release.key
new file mode 100644
index 00000000..a737316d
--- /dev/null
+++ b/osmo-smlc-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
+b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4
+pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH
+/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY
+VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi
+K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa
+X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW
+XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig
+7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v
+d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=
+=/Tek
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/osmo-smlc-master/osmo-smlc.cfg b/osmo-smlc-master/osmo-smlc.cfg
new file mode 100644
index 00000000..4ca7b401
--- /dev/null
+++ b/osmo-smlc-master/osmo-smlc.cfg
@@ -0,0 +1,9 @@
+log stderr
+ logging filter all 1
+ logging color 1
+ logging print category 0
+ logging timestamp 0
+ logging level set-all notice
+line vty
+ no login
+ bind 0.0.0.0