diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..0fcd3fe9
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "ext/pl-clojure-style"]
+	path = ext/pl-clojure-style
+	url = git://github.com/puppetlabs/pl-clojure-style.git
diff --git a/ext/pl-clojure-style b/ext/pl-clojure-style
new file mode 160000
index 00000000..dbfe1e73
--- /dev/null
+++ b/ext/pl-clojure-style
@@ -0,0 +1 @@
+Subproject commit dbfe1e731c142090a13a59a255272e9408585c0b
diff --git a/project.clj b/project.clj
index 4f4c9ffa..544c845e 100644
--- a/project.clj
+++ b/project.clj
@@ -39,7 +39,8 @@
                                      :sign-releases false}]]
 
   ;; Convenience for manually testing application shutdown support - run `lein test-external-shutdown`
-  :aliases {"test-external-shutdown" ["trampoline" "run" "-m" "examples.shutdown-app.test-external-shutdown"]}
+  :aliases {"cljfmt" ["with-profile" "+cljfmt" "cljfmt"]
+            "test-external-shutdown" ["trampoline" "run" "-m" "examples.shutdown-app.test-external-shutdown"]}
 
   ;; By declaring a classifier here and a corresponding profile below we'll get an additional jar
   ;; during `lein jar` that has all the code in the test/ directory. Downstream projects can then
@@ -47,7 +48,11 @@
   ;; code that we have.
   :classifiers [["test" :testutils]]
 
-  :profiles {:dev {:source-paths ["examples/shutdown_app/src"
+  :profiles {:cljfmt {:plugins [[lein-cljfmt "0.5.0"]
+                                [lein-parent "0.2.1"]]
+                      :parent-project {:path "ext/pl-clojure-style/project.clj"
+                                       :inherit [:cljfmt]}}
+             :dev {:source-paths ["examples/shutdown_app/src"
                                   "examples/java_service/src/clj"]
                    :java-source-paths ["examples/java_service/src/java"]
                    :dependencies [[spyscope "0.1.4"]