diff --git a/README.md b/README.md
index fadb979..e7199bf 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ dockerfiles
 - [ ] hubot
 - [ ] iptables
 - [ ] irc
+- [ ] samba
 - [ ] snort
 - [ ] tshark
 
@@ -39,6 +40,7 @@ dockerfiles
 - [x] pdnsd
 - [x] phantomjs
 - [x] phpbb
+- [x] piwik
 - [x] polipo
 - [x] pptpd
 - [x] privoxy
diff --git a/samba/Dockerfile b/samba/Dockerfile
new file mode 100644
index 0000000..71f2579
--- /dev/null
+++ b/samba/Dockerfile
@@ -0,0 +1,17 @@
+#
+# Dockerfile for samba
+#
+
+FROM alpine
+MAINTAINER kev <noreply@datageek.info>
+
+RUN apk add -U samba-common-tools samba-server \
+    && rm -rf /var/cache/apk/*
+
+COPY smb.conf /etc/samba/
+
+VOLUME /etc/samba
+
+EXPOSE 137/udp 138/udp 139/tcp 445/tcp
+
+CMD smbd --foreground --log-stdout
diff --git a/samba/README.md b/samba/README.md
new file mode 100644
index 0000000..afa200f
--- /dev/null
+++ b/samba/README.md
@@ -0,0 +1,6 @@
+samba
+=====
+
+[`Samba`][1] is the standard Windows interoperability suite of programs for Linux and Unix.
+
+[1]: https://www.samba.org/
diff --git a/samba/docker-compose.yml b/samba/docker-compose.yml
new file mode 100644
index 0000000..21408e5
--- /dev/null
+++ b/samba/docker-compose.yml
@@ -0,0 +1,8 @@
+samba:
+  build: .
+  ports:
+    - "137:137/udp"
+    - "138:138/udp"
+    - "139:139/tcp"
+    - "445:445/tcp"
+  restart: always
diff --git a/samba/smb.conf b/samba/smb.conf
new file mode 100644
index 0000000..217c099
--- /dev/null
+++ b/samba/smb.conf
@@ -0,0 +1,28 @@
+[global]
+workgroup = WORKGROUP
+server string = %h server (Samba, Apline)
+dns proxy = no
+log file = /var/log/samba/log.%m
+max log size = 1000
+syslog = 0
+panic action = /usr/share/samba/panic-action %d
+server role = standalone server
+passdb backend = tdbsam
+obey pam restrictions = yes
+unix password sync = yes
+passwd program = /usr/bin/passwd %u
+passwd chat = *Enter\snew\s*\spassword:* %n\n *Retype\snew\s*\spassword:* %n\n *password\supdated\ssuccessfully* .
+pam password change = yes
+map to guest = bad user
+usershare allow guests = yes
+load printers = no
+show add printer wizard = no
+printing = none
+printcap name = /dev/null
+disable spoolss = yes 
+
+[root]
+path = /root
+browseable = yes
+read only = yes
+guest ok = yes