diff --git a/.jenkins.d/10-ndn-cxx.sh b/.jenkins.d/10-ndn-cxx.sh
index 0d4239e..8b9441a 100755
--- a/.jenkins.d/10-ndn-cxx.sh
+++ b/.jenkins.d/10-ndn-cxx.sh
@@ -17,28 +17,38 @@
     fi
 fi
 
-if [[ -z $INSTALLED_VERSION ]]; then
-    INSTALLED_VERSION=$((cd ndn-cxx && git rev-parse HEAD) 2>/dev/null || echo NONE)
-fi
+## Uncomment when #3920 and #4119 merge.
+# if [[ -z $INSTALLED_VERSION ]]; then
+#     INSTALLED_VERSION=$((cd ndn-cxx && git rev-parse HEAD) 2>/dev/null || echo NONE)
+# fi
 
 sudo rm -Rf ndn-cxx-latest
-
-git clone --depth 1 git://github.com/named-data/ndn-cxx ndn-cxx-latest
-
-LATEST_VERSION=$((cd ndn-cxx-latest && git rev-parse HEAD) 2>/dev/null || echo UNKNOWN)
-
-if [[ $INSTALLED_VERSION != $LATEST_VERSION ]]; then
-    sudo rm -Rf ndn-cxx
-    mv ndn-cxx-latest ndn-cxx
-else
-    sudo rm -Rf ndn-cxx-latest
+## Remove this when #3920 and #4119 merge
+if [ ! -d "ndn-cxx-hotfix" ]; then
+    ## Remove '-hotfix' off the end when #3920 and #4119 merge.
+    git clone git://github.com/named-data/ndn-cxx ndn-cxx-hotfix
 fi
 
+## Uncomment when #3920 and #4119 merge.
+# LATEST_VERSION=$((cd ndn-cxx-latest && git rev-parse HEAD) 2>/dev/null || echo UNKNOWN)
+
+# if [[ $INSTALLED_VERSION != $LATEST_VERSION ]]; then
+#     sudo rm -Rf ndn-cxx
+#     mv ndn-cxx-latest ndn-cxx
+#     cp ndn-cxx ndn-cxx-hotfix
+# else
+#     sudo rm -Rf ndn-cxx-latest
+# fi
+
 sudo rm -Rf /usr/local/include/ndn-cxx
 sudo rm -f /usr/local/lib/libndn-cxx*
 sudo rm -f /usr/local/lib/pkgconfig/libndn-cxx*
 
-pushd ndn-cxx >/dev/null
+## Change to the hotfix directory instead of the normal ndn-cxx directory
+## Restore below line when #3920 and #4119 merge.
+#pushd ndn-cxx >/dev/null
+pushd ndn-cxx-hotfix >/dev/null
+git checkout b555b00c280b9c9ed46f24a1fbebc73b720601af
 
 ./waf configure -j1 --color=yes --enable-shared --disable-static --without-osx-keychain
 ./waf -j1 --color=yes
diff --git a/.jenkins.d/11-chronosync.sh b/.jenkins.d/11-chronosync.sh
index 6fb1d9f..1f7d6c1 100755
--- a/.jenkins.d/11-chronosync.sh
+++ b/.jenkins.d/11-chronosync.sh
@@ -17,28 +17,31 @@
     fi
 fi
 
-if [[ -z $INSTALLED_VERSION ]]; then
-    INSTALLED_VERSION=$((cd ChronoSync && git rev-parse HEAD) 2>/dev/null || echo NONE)
-fi
+# if [[ -z $INSTALLED_VERSION ]]; then
+#     INSTALLED_VERSION=$((cd ChronoSync && git rev-parse HEAD) 2>/dev/null || echo NONE)
+# fi
 
 sudo rm -Rf ChronoSync-latest
-
-git clone --depth 1 git://github.com/named-data/ChronoSync ChronoSync-latest
-
-LATEST_VERSION=$((cd ChronoSync-latest && git rev-parse HEAD) 2>/dev/null || echo UNKNOWN)
-
-if [[ $INSTALLED_VERSION != $LATEST_VERSION ]]; then
-    sudo rm -Rf ChronoSync
-    mv ChronoSync-latest ChronoSync
-else
-    sudo rm -Rf ChronoSync-latest
+## Remove line when #3920 and #4119 merge.
+if [ ! -d "ChronoSync-hotfix" ]; then
+    git clone git://github.com/named-data/ChronoSync ChronoSync-hotfix
 fi
 
+# LATEST_VERSION=$((cd ChronoSync-latest && git rev-parse HEAD) 2>/dev/null || echo UNKNOWN)
+
+# if [[ $INSTALLED_VERSION != $LATEST_VERSION ]]; then
+#     sudo rm -Rf ChronoSync
+#     mv ChronoSync-latest ChronoSync
+# else
+#     sudo rm -Rf ChronoSync-latest
+# fi
+
 sudo rm -Rf /usr/local/include/ChronoSync
 sudo rm -f /usr/local/lib/libChronoSync*
 sudo rm -f /usr/local/lib/pkgconfig/ChronoSync*
 
-pushd ChronoSync >/dev/null
+pushd ChronoSync-hotfix >/dev/null
+git checkout 097bb448f46b8bd9a5c1f431e824f8f6a169b650
 
 if has FreeBSD10 $NODE_LABELS; then
     export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/