diff --git a/CMake/cdat_modules/pep8_deps.cmake b/CMake/cdat_modules/pep8_deps.cmake
new file mode 100644
index 0000000000..e57f7cf7e3
--- /dev/null
+++ b/CMake/cdat_modules/pep8_deps.cmake
@@ -0,0 +1 @@
+set(pep8_deps ${python_pkg} ${setuptools_pkg})
diff --git a/CMake/cdat_modules/pep8_external.cmake b/CMake/cdat_modules/pep8_external.cmake
new file mode 100644
index 0000000000..c6dc541c76
--- /dev/null
+++ b/CMake/cdat_modules/pep8_external.cmake
@@ -0,0 +1,16 @@
+# The pep8 project
+
+set(pep8_binary "${CMAKE_CURRENT_BINARY_DIR}/build/pep8")
+
+ExternalProject_Add(pep8
+  DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}
+  SOURCE_DIR ${pep8_binary}
+  URL ${PEP8_SOURCE}
+  URL_MD5 ${PEP8_MD5}
+  BUILD_IN_SOURCE 1
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ${PYTHON_EXECUTABLE} setup.py build
+  INSTALL_COMMAND ${PYTHON_EXECUTABLE} setup.py install ${PYTHON_EXTRA_PREFIX}
+  DEPENDS ${pep8_deps}
+  ${ep_log_options}
+  )
diff --git a/CMake/cdat_modules/pep8_pkg.cmake b/CMake/cdat_modules/pep8_pkg.cmake
new file mode 100644
index 0000000000..c03f35261b
--- /dev/null
+++ b/CMake/cdat_modules/pep8_pkg.cmake
@@ -0,0 +1,16 @@
+set( PEP8_MAJOR 1 )
+set( PEP8_MINOR 6 )
+set( PEP8_PATCH 2)
+set( PEP8_VERSION ${PEP8_MAJOR}.${PEP8_MINOR}.${PEP8_PATCH} )
+set( PEP8_URL ${LLNL_URL} )
+set( PEP8_GZ pep8-${PEP8_VERSION}.tar.gz )
+set( PEP8_MD5 c7a3f57d832484a6295164661fbb1335 )
+
+set (nm PEP8)
+string(TOUPPER ${nm} uc_nm)
+set(${uc_nm}_VERSION ${${nm}_MAJOR}.${${nm}_MINOR}.${${nm}_PATCH})
+set(PEP8_SOURCE ${PEP8_URL}/${PEP8_GZ})
+
+if (BUILD_TESTING)
+  add_cdat_package(pep8 "" "" ON)
+endif()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04a8ce7397..df00cb8f64 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -488,6 +488,7 @@ include(dateutils_pkg)
 include(pyparsing_pkg)
 include(md5_pkg)
 include(mpi4py_pkg)
+include(pep8_pkg)
 include(pyopenssl_pkg)
 include(setuptools_pkg)
 include(myproxyclient_pkg)