diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index 90bbbd2f1b..0000000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-version: 2
-jobs:
-  build:
-    docker:
-      - image: djarek/boost_superproject_build
-    parallelism: 2
-    environment:
-      EOL_N: LF CRLF
-    steps:
-      - checkout
-      - run: wget "https://raw.githubusercontent.com/boostorg/release-tools/develop/ci_boost_common.py" -P ${HOME}
-      - run: wget "https://raw.githubusercontent.com/boostorg/release-tools/develop/ci_boost_release.py" -P ${HOME}
-      - run: python ${HOME}/ci_boost_release.py checkout_post
-      - run: python ${HOME}/ci_boost_release.py dependencies_override
-      - run: EOL_A=(${EOL_N}) EOL=${EOL_A[$CIRCLE_NODE_INDEX]} python ${HOME}/ci_boost_release.py test_override
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 0000000000..e492b394c2
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,54 @@
+# Use, modification, and distribution are
+# subject to the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#
+# Copyright Rene Rivera 2015-2016.
+
+machine:
+  environment:
+    SCRIPT_N: ci_boost_release ci_boost_release
+    EOL_N: LF CRLF
+  pre:
+    - |
+        wget "https://raw.githubusercontent.com/boostorg/release-tools/develop/ci_boost_common.py" -P ${HOME}
+        wget "https://raw.githubusercontent.com/boostorg/release-tools/develop/ci_boost_library_check.py" -P ${HOME}
+        wget "https://raw.githubusercontent.com/boostorg/release-tools/develop/ci_boost_release.py" -P ${HOME}
+        wget "https://raw.githubusercontent.com/boostorg/release-tools/develop/ci_boost_status.py" -P ${HOME}
+        echo '#!/bin/bash' > ${HOME}/script.sh
+        echo 'export SCRIPT_N=(${SCRIPT_N})' >> "${HOME}/script.sh"
+        echo 'export SCRIPT=${SCRIPT_N[$CIRCLE_NODE_INDEX]}' >> "${HOME}/script.sh"
+        echo 'export EOL_N=(${EOL_N})' >> "${HOME}/script.sh"
+        echo 'export EOL=${EOL_N[$CIRCLE_NODE_INDEX]}' >> "${HOME}/script.sh"
+        echo 'python "${HOME}/${SCRIPT}.py" "$@"' >> "${HOME}/script.sh"
+        chmod +x "${HOME}/script.sh"
+  post:
+    - sudo apt-get update
+    - sudo apt-get install xsltproc
+    - exec "${HOME}/script.sh" machine_post
+checkout:
+  post:
+    - exec "${HOME}/script.sh" checkout_post
+dependencies:
+  pre:
+    - exec "${HOME}/script.sh" dependencies_pre
+  override:
+    - exec "${HOME}/script.sh" dependencies_override
+  post:
+    - exec "${HOME}/script.sh" dependencies_post
+database:
+  pre:
+    - exec "${HOME}/script.sh" database_pre
+  override:
+    - exec "${HOME}/script.sh" database_override
+  post:
+    - exec "${HOME}/script.sh" database_post
+test:
+  pre:
+    - exec "${HOME}/script.sh" test_pre:
+        parallel: true
+  override:
+    - exec "${HOME}/script.sh" test_override:
+        parallel: true
+  post:
+    - exec "${HOME}/script.sh" test_post:
+        parallel: true