diff --git a/grammars.yml b/grammars.yml
index af3a2e3a..ad9357a0 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -66,6 +66,8 @@ https://github.com/aroben/ada.tmbundle/raw/c45eed4d5f98fe3bcbbffbb9e436601ab5bbd
 https://github.com/aroben/ruby.tmbundle@4636a3023153c3034eb6ffc613899ba9cf33b41f:
 - source.ruby
 - text.html.erb
+https://github.com/asbjornenge/Docker.tmbundle:
+- source.dockerfile
 https://github.com/atom/language-coffee-script:
 - source.coffee
 - source.litcoffee
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index e1d9ee3d..416544d2 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -605,6 +605,14 @@ Diff:
   aliases:
   - udiff
 
+Docker File:
+  type: data
+  tm_scope: source.dockerfile
+  extensions:
+  - .dockerfile
+  filenames:
+  - Dockerfile
+
 Dogescript:
   type: programming
   color: "#cca760"
@@ -2273,8 +2281,6 @@ Shell:
   - bash
   - sh
   - zsh
-  filenames:
-  - Dockerfile
 
 ShellSession:
   type: programming
diff --git a/samples/Shell/filenames/Dockerfile b/samples/Shell/filenames/Dockerfile
deleted file mode 100644
index 46f9b585..00000000
--- a/samples/Shell/filenames/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file describes the standard way to build Docker, using docker
-docker-version 0.4.2
-from	ubuntu:12.04
-maintainer	Solomon Hykes <solomon@dotcloud.com>
-# Build dependencies
-run	apt-get install -y -q curl
-run	apt-get install -y -q git
-# Install Go
-run	curl -s https://go.googlecode.com/files/go1.1.1.linux-amd64.tar.gz | tar -v -C /usr/local -xz
-env	PATH	/usr/local/go/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin
-env	GOPATH	/go
-env	CGO_ENABLED 0
-run	cd /tmp && echo 'package main' > t.go && go test -a -i -v
-# Download dependencies
-run	PKG=github.com/kr/pty REV=27435c699;		 git clone http://$PKG /go/src/$PKG && cd /go/src/$PKG && git checkout -f $REV
-run	PKG=github.com/gorilla/context/ REV=708054d61e5; git clone http://$PKG /go/src/$PKG && cd /go/src/$PKG && git checkout -f $REV
-run	PKG=github.com/gorilla/mux/ REV=9b36453141c;	 git clone http://$PKG /go/src/$PKG && cd /go/src/$PKG && git checkout -f $REV
-# Run dependencies
-run	apt-get install -y iptables
-# lxc requires updating ubuntu sources
-run	echo 'deb http://archive.ubuntu.com/ubuntu precise main universe' > /etc/apt/sources.list
-run	apt-get update
-run	apt-get install -y lxc
-run	apt-get install -y aufs-tools
-# Upload docker source
-add	.       /go/src/github.com/dotcloud/docker
-# Build the binary
-run	cd /go/src/github.com/dotcloud/docker/docker && go install -ldflags "-X main.GITCOMMIT '??' -d -w"
-env	PATH	/usr/local/go/bin:/go/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin
-cmd	["docker"]