diff --git a/cabal2spec b/cabal2spec
index ab68656..47b74db 100755
--- a/cabal2spec
+++ b/cabal2spec
@@ -2,29 +2,47 @@
 
 set -e
 
-[ $# -ne 1 -o ! -r "$1" ] && echo "Usage: $0 hackage-version.tar.gz" && exit 1
+[ $# -ne 1 -o ! -r "$1" ] && echo "Usage: $(basename $0) [hackage.tar.gz|hackage.cabal]" && exit 1
 
-HACKAGE=$1
+FILE=$1
 
-INPUT=$(basename $HACKAGE .tar.gz)
+case $FILE in
+    *.tar.gz)
+	TARNAME_VER=$(basename $FILE .tar.gz)
+	TARVERSION=$(echo $TARNAME_VER | sed -e "s/.*-//")
+	TARNAME=$(echo $TARNAME_VER | sed -e "s/-$TARVERSION//")
+	WORKDIR=$(mktemp -d)
+	tar zxf $FILE -C $WORKDIR "*.cabal" 
+	CABAL="$WORKDIR/*/*.cabal" ;;
+    *.cabal)
+	CABAL=$FILE ;;
+esac
 
-VERSION=$(echo $INPUT | sed -e "s/.*-//")
-NAME=$(echo $INPUT | sed -e "s/-$VERSION//")
+NAME=$(grep -i ^name: $CABAL | sed -e "s/[Nn]ame:[ \t]*//")
+if [ -n "$TARNAME" -a "$TARNAME" != "$NAME" ]; then
+  echo "Warning: tarball name ($TARNAME) and cabal name ($NAME) differ!"
+fi
 
-TMPDIR=$(mktemp -d)
-CURRENT_DIR=$PWD
-cd $TMPDIR
-tar zxf $HACKAGE "*.cabal"
+VERSION=$(grep -i ^version: $CABAL | sed -e "s/[Vv]ersion:[ \t]*//")
+if [ -n "$TARVERSION" -a "$TARVERSION" != "$VERSION" ]; then
+  echo "Warning: tarball version ($TARVERSION) and cabal version ($VERSION) differ!"
+fi
 
-if grep -qi exposed-modules: */*.cabal; then
+CABALFILENAME=$(basename $CABAL .cabal)
+if [ "$CABALFILENAME" != "$NAME" ]; then
+  echo "Warning: .cabal filename ($CABALFILENAME) and cabal Name field ($NAME) differ!"
+fi
+
+
+if grep -qi exposed-modules: $CABAL; then
   HAS_LIB=yes
 fi
 
-if grep -qi executable */*.cabal; then
+if grep -qi executable $CABAL; then
   HAS_BIN=yes
 fi
-cd -
-rm -rf $TMPDIR
+
+[ -d "$WORKDIR" ] && rm -r $WORKDIR
 
 if [ "$HAS_LIB" -a ! "$HAS_BIN" ]; then
   PREFIX=ghc-
@@ -36,7 +54,7 @@ SPECFILE=$PREFIX$NAME.spec
 
 cp /usr/share/ghc/cabal-${HAS_BIN:+bin}${HAS_LIB:+lib}-template.spec.in $SPECFILE
 
-echo "created $SPECFILE (${HAS_BIN:+bin}${HAS_LIB:+lib})"
+echo "created $SPECFILE (${HAS_BIN:+bin}${HAS_LIB:+lib}) for $NAME-$VERSION"
 
 DATE=$(env LANG=C date +"%a %b %e %Y")
 
diff --git a/ghc.spec b/ghc.spec
index 84a489c..ba02fae 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -229,6 +229,10 @@ fi
 %endif
 
 %changelog
+* Fri Nov 28 2008 Jens Petersen <petersen@redhat.com>
+- make cabal2spec work on .cabal files too, and
+  read and check name and version from .cabal
+
 * Tue Nov 25 2008 Jens Petersen <petersen@redhat.com> - 6.10.1-5
 - add cabal2spec and template files for easy cabal hackage packaging
 - simplify script macros: make ghc_preinst_script and ghc_postun_script no-ops