diff --git a/inkscape-split-extensions-extra.sh b/inkscape-split-extensions-extra.sh
index cf6ca58..597bc39 100644
--- a/inkscape-split-extensions-extra.sh
+++ b/inkscape-split-extensions-extra.sh
@@ -15,7 +15,7 @@ make_extra_list() {
 
 # Search all py files that are imported by mentioned modules:
 make_deplist() {
-    NEWLIST=( $( ( (IFS=$'\n' ; echo "${NEWLIST[*]}"$'\n') ; sed 2>/dev/null -n 's/^from \(.*\) import.*/\1/p;s/^import //p' ${NEWLIST[@]} | sed 's/, /\n/g' | sed 's/$/.py/;s/\.py\.py$/.py/') | sort -u) )
+    NEWLIST=( $( ( (IFS=$'\n' ; echo "${NEWLIST[*]}"$'\n') ; sed 2>/dev/null -n 's/^from \(.*\) import.*/\1/p;s/^import \([^#]*\).* */\1/p' ${NEWLIST[@]} | sed 's/as .*//g;s/, */\n/g;s/ //g' | sed 's/$/.py/;s/\.py\.py$/.py/') | sort -u) )
 }
 
 OLDLIST=( EMPTY )
diff --git a/inkscape.changes b/inkscape.changes
index f87f55c..bd2eb28 100644
--- a/inkscape.changes
+++ b/inkscape.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Nov 22 19:53:52 UTC 2014 - stefan.bruens@rwth-aachen.de
+
+- make inkscape-split-extensions-extra script more robust
+  (comments, 'as' keyword, leading/trailing whitespace)
+
 -------------------------------------------------------------------
 Tue Jul 22 13:01:10 UTC 2014 - fstrba@suse.com