diff --git a/src/usr/doc/THANKS b/src/usr/doc/THANKS
index 9f63a63..63dac93 100644
--- a/src/usr/doc/THANKS
+++ b/src/usr/doc/THANKS
@@ -89,3 +89,4 @@ We moved to github, so revision number no longer used
     Chris Abela
     Sergey V.
     Marcel Saegebarth
+    Loki Harfagr
diff --git a/src/usr/sbin/sbopkg b/src/usr/sbin/sbopkg
index a16115e..197dfa3 100755
--- a/src/usr/sbin/sbopkg
+++ b/src/usr/sbin/sbopkg
@@ -3147,6 +3147,14 @@ remove_obsolete_sources() {
 
     rm -f $PROGRESSBAR_INTERRUPTED
 
+### avoiding unecessary work and time lapse in case the user
+### does not remember he just deleted the sources previously
+    (( $(find $SRCDIR -type f | wc -l ) == 0 ))
+    if [ $? -eq 0 ]; then
+        echo "No sources available"
+        exit 1
+    fi
+
     { # Grouping for progressbar
     echo 0 # Progressbar begin
 
diff --git a/tools/ChangeLog-latest.txt b/tools/ChangeLog-latest.txt
index bbc4049..b3b1d73 100644
--- a/tools/ChangeLog-latest.txt
+++ b/tools/ChangeLog-latest.txt
@@ -15,6 +15,8 @@ sbopkg-dev (2017-06-25 08:58:00 UTC)
           Feature Request by Jeremy/bassmadrigal (Fixed #13).
           Implement contributions from Marcel Saegebarth.
         * sqg: Added manual page for sqg.
+	* sbopkg: No need to do complete check for old sources if no sources available
+	  Initial patch by Loki Harfagr
 
     MODIFICATIONS
 	* bash-completion: Complete -i and -b when git repo is used