diff --git a/etc/cron.daily/40-autodist-upstream-updates b/etc/cron.daily/40-autodist-upstream-updates
index f4fe0dc..95f4a12 100755
--- a/etc/cron.daily/40-autodist-upstream-updates
+++ b/etc/cron.daily/40-autodist-upstream-updates
@@ -1,16 +1,20 @@
 #!/bin/bash
 #
 # autodist-upstream-updates daily cron script
-# (c) 2008-2012 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# (c) 2008-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 . /etc/autodist/config
-REPOSITORY=devel
-/usr/sbin/autodist-upstream-updates -q -h -u -r $REPOSITORY > $LOCAL_REPS_BASE_DIR/distromatic/$REPOSITORY/_popular.html
+. /etc/sysconfig/autoport
 
-REPOSITORY=milestone1-1.1
-/usr/sbin/autodist-upstream-updates -q -h -u -r $REPOSITORY > $LOCAL_REPS_BASE_DIR/distromatic/$REPOSITORY/_popular.html
+if [ ! "$AUTOPORT_UPDATE_NO_DISTROMATIC" ]; then
+   REPOSITORY=devel
+   /usr/sbin/autodist-upstream-updates -q -h -u -r $REPOSITORY > $LOCAL_REPS_BASE_DIR/distromatic/$REPOSITORY/_popular.html
 
-REPOSITORY=milestone2
-/usr/sbin/autodist-upstream-updates -q -h -u -r $REPOSITORY > $LOCAL_REPS_BASE_DIR/distromatic/$REPOSITORY/_popular.html
+   REPOSITORY=milestone1-1.1
+   /usr/sbin/autodist-upstream-updates -q -h -u -r $REPOSITORY > $LOCAL_REPS_BASE_DIR/distromatic/$REPOSITORY/_popular.html
+
+   REPOSITORY=milestone2
+   /usr/sbin/autodist-upstream-updates -q -h -u -r $REPOSITORY > $LOCAL_REPS_BASE_DIR/distromatic/$REPOSITORY/_popular.html
+fi
 
 exit 0