diff --git a/.travis.yml b/.travis.yml
index 563806977a..146748d95a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,6 +49,8 @@ branches:
     - master
     - staging
     - trying
+    # to build docs
+    - v0.4.x
 
 notifications:
   email:
diff --git a/ci/after-success.sh b/ci/after-success.sh
index 65ddb90483..e7d24ef869 100644
--- a/ci/after-success.sh
+++ b/ci/after-success.sh
@@ -37,6 +37,6 @@ if [ -z ${TRAVIS_PULL_REQUEST-} ]; then
     TRAVIS_PULL_REQUEST=false
 fi
 
-if [ $TRAVIS_BRANCH = master ] && [ $TRAVIS_PULL_REQUEST = false ]; then
+if { [ $TRAVIS_BRANCH = master ] || [ $TRAVIS_BRANCH = v0.4.x ]; } && [ $TRAVIS_PULL_REQUEST = false ]; then
     main
 fi
diff --git a/ci/script.sh b/ci/script.sh
index 492f33f6bd..327bdfc3ea 100644
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -224,6 +224,6 @@ if [ -z ${TARGET-} ]; then
     TARGET=$(rustc -Vv | grep host | cut -d ' ' -f2)
 fi
 
-if [ $TRAVIS_BRANCH != master ] || [ $TRAVIS_PULL_REQUEST != false ]; then
+if { [ $TRAVIS_BRANCH != master ] && [ $TRAVIS_BRANCH != v0.4.x ]; } || [ $TRAVIS_PULL_REQUEST != false ]; then
     main
 fi
diff --git a/macros/src/codegen.rs b/macros/src/codegen.rs
index d5bd3b4229..a7cd020574 100644
--- a/macros/src/codegen.rs
+++ b/macros/src/codegen.rs
@@ -507,7 +507,6 @@ fn post_init(ctxt: &Context, app: &App, analysis: &Analysis) -> proc_macro2::Tok
 
     // Enable cycle counter
     if cfg!(feature = "timer-queue") {
-        exprs.push(quote!(p.DCB.enable_trace()));
         exprs.push(quote!(p.DWT.enable_cycle_counter()));
     }
 
@@ -2033,6 +2032,9 @@ fn pre_init(ctxt: &Context, app: &App, analysis: &Analysis) -> proc_macro2::Toke
                 p.DWT.lar.write(0xC5ACCE55);
             }
         ));
+
+        // We need to explicitly enable the trace block to set CYCCNT.
+        exprs.push(quote!(p.DCB.enable_trace();));
         exprs.push(quote!(p.DWT.ctrl.modify(|r| r & !1);));
         exprs.push(quote!(p.DWT.cyccnt.write(0);));
     }