diff --git a/tools/mockup.sh b/tools/mockup.sh
index 1fd293ab432a..f8a0fc95ebb2 100755
--- a/tools/mockup.sh
+++ b/tools/mockup.sh
@@ -15,17 +15,12 @@ if [ $# -eq 0 ]; then
 fi
 
 for SYMBOL; do
-    WHERE=$(grep -nH "^[a-z0-9_ ]* [*]*$SYMBOL(" */*.h )
+    WHERE=$(grep -nH "^[a-zA-Z0-9_ (),]* [*]*$SYMBOL(" */*.h )
     if [ x"$WHERE" != x ]; then
 	STUB='\n{ fprintf(stderr, "'$SYMBOL' called!\\n"); abort(); }'
     else
-	WHERE=$(grep -nH "^extern \(const \)\?struct [a-zA-Z0-9_]* $SYMBOL;$" daemon/*.h)
-	if [ x"$WHERE" != x ]; then
-	    STUB=';'
-	else
-	    echo "/* Could not find declaration for $SYMBOL */"
-	    continue
-	fi
+	echo "/* Could not find declaration for $SYMBOL */"
+	continue
     fi
 	
     echo "/* Generated stub for $SYMBOL */"
@@ -35,5 +30,5 @@ for SYMBOL; do
     END=$(tail -n +$LINE < $FILE | grep -n ';$');
     NUM=${END%%:*}
 
-    tail -n +$LINE < $FILE | head -n $NUM | sed 's/^extern *//' | sed 's/PRINTF_FMT([^)]*)//' | sed 's/,/ UNNEEDED,/g' | sed 's/\([a-z0-9A-Z*_]* [a-z0-9A-Z*_]*\));/\1 UNNEEDED);/' | sed "s/;\$/$STUB/" | sed 's/\s*$//'
+    tail -n +$LINE < $FILE | head -n $NUM | sed 's/^extern *//' | sed 's/PRINTF_FMT([^)]*)//' | sed 's/NORETURN//g' | sed 's/,/ UNNEEDED,/g' | sed 's/\([a-z0-9A-Z*_]* [a-z0-9A-Z*_]*\));/\1 UNNEEDED);/' | sed "s/;\$/$STUB/" | sed 's/\s*$//'
 done