diff --git a/AUTHORS b/AUTHORS
index 1a592ba..e060548 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -33,6 +33,9 @@ Contributions
    - Improved binary detection and good suggestions.
    - Better portability for non-bash shells.
 
+  Felipe Scarel <fbscarel [at] com.gmail>
+   - Bugfix for --no-swap + LVM
+
   Radu Spineanu <radu [at] org.debian>
    - Supplied many small tweaks, bugfixes, and suggestions.
    - Radu is also the Debian package maintainer and has CVS commit access.
diff --git a/bin/xen-create-image b/bin/xen-create-image
index 73a43c0..99df76a 100755
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -512,7 +512,7 @@ Install an X11 server, using VNC and XDM
  --
  http://www.steve.org.uk/
 
- $Id: xen-create-image,v 1.120 2006-12-26 00:55:58 steve Exp $
+ $Id: xen-create-image,v 1.121 2007-01-05 14:05:44 steve Exp $
 
 =cut
 
@@ -1108,7 +1108,7 @@ sub parseCommandLineArguments
 
     if ( $VERSION )
     {
-        my $REVISION      = '$Revision: 1.120 $';
+        my $REVISION      = '$Revision: 1.121 $';
         if ( $REVISION =~ /1.([0-9.]+) / )
         {
             $REVISION = $1;
@@ -1865,9 +1865,12 @@ sub createLVMBits
     }
     if ( ! -e $lvm_swap )
     {
-        logprint( "The LVM disk image creation failed to create $swap.\n" );
-        logprint( "aborting\n" );
-        exit;
+	unless( $CONFIG{'noswap'} )
+	{
+	        logprint( "The LVM disk image creation failed to create $swap.\n" );
+	        logprint( "aborting\n" );
+	        exit;
+	}
     }