diff --git a/osmo-pcap-master/Dockerfile b/osmo-pcap-master/Dockerfile
new file mode 100644
index 00000000..a2b75c1a
--- /dev/null
+++ b/osmo-pcap-master/Dockerfile
@@ -0,0 +1,51 @@
+ARG	USER
+ARG	DISTRO
+FROM	$USER/$DISTRO-build
+# Arguments used after FROM must be specified again
+ARG	DISTRO
+
+RUN	case "$DISTRO" in \
+	debian*) \
+		apt-get update && \
+		apt-get install -y --no-install-recommends \
+			libosmocore-dev \
+			libosmo-netif-dev \
+			libzmq3-dev \
+			&& \
+		apt-get clean \
+		;; \
+	centos*) \
+		dnf install -y \
+			"pkgconfig(libosmo-netif)" \
+			"pkgconfig(libosmocore)" \
+			"pkgconfig(libosmoctrl)" \
+			"pkgconfig(libosmogsm)" \
+			"pkgconfig(libosmovty)" \
+			"pkgconfig(libzmq)" \
+		;; \
+	esac
+
+WORKDIR	/tmp
+
+ARG	OSMO_PCAP_BRANCH="master"
+
+RUN	git clone git://git.osmocom.org/osmo-pcap.git
+ADD	http://git.osmocom.org/osmo-pcap/patch?h=$OSMO_PCAP_BRANCH /tmp/commit-osmo-pcap
+
+RUN	cd osmo-pcap && \
+	git fetch && git checkout $OSMO_PCAP_BRANCH && \
+	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_PCAP_BRANCH || exit 1); \
+	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
+	autoreconf -fi && \
+	./configure && \
+	make "-j$(nproc)" install
+
+VOLUME	/data
+
+COPY	osmo-pcap-client.cfg /data/osmo-pcap-client.cfg
+#COPY	osmo-pcap-server.cfg /data/osmo-pcap-server.cfg
+
+WORKDIR	/data
+CMD	["/bin/sh", "-c", "/usr/local/bin/osmo-pcap-client -c /data/osmo-pcap-client.cfg > /data/osmo-pcap-client.log 2>&1"]
+
+#EXPOSE
diff --git a/osmo-pcap-master/Makefile b/osmo-pcap-master/Makefile
new file mode 100644
index 00000000..8d0e10b4
--- /dev/null
+++ b/osmo-pcap-master/Makefile
@@ -0,0 +1 @@
+include ../make/Makefile
diff --git a/osmo-pcap-master/osmo-pcap-client.cfg b/osmo-pcap-master/osmo-pcap-client.cfg
new file mode 100644
index 00000000..89f1801f
--- /dev/null
+++ b/osmo-pcap-master/osmo-pcap-client.cfg
@@ -0,0 +1,14 @@
+!
+! OsmoPCAPClient (UNKNOWN-dirty) configuration saved from vty
+!!
+!
+!
+line vty
+ no login
+!
+client
+ pcap device lo
+ pcap filter udp port 44423
+ pcap detect-loop 0
+ server ip 127.0.0.1
+ server port 5000