diff --git a/src/bin/write_sample.rs b/src/bin/write_sample.rs
index 61af6aa3..4c25f4e6 100644
--- a/src/bin/write_sample.rs
+++ b/src/bin/write_sample.rs
@@ -24,7 +24,8 @@ fn doit(filename: &str) -> std::io::IoResult<()>
     try!(zip.start_file("test/lorem_ipsum.txt", zip::compression::Deflated));
     try!(zip.write(LOREM_IPSUM));
 
-    zip.finalize()
+    try!(zip.finish());
+    Ok(())
 }
 
 static LOREM_IPSUM : &'static [u8] = b"Lorem ipsum dolor sit amet, consectetur adipiscing elit. In tellus elit, tristique vitae mattis egestas, ultricies vitae risus. Quisque sit amet quam ut urna aliquet
diff --git a/src/reader.rs b/src/reader.rs
index 45e47123..2ba605b4 100644
--- a/src/reader.rs
+++ b/src/reader.rs
@@ -129,4 +129,12 @@ impl<T: Reader+Seek> ZipReader<T>
         };
         Ok(reader)
     }
+
+    /// Unwrap and return the inner reader object
+    ///
+    /// The position of the reader is undefined.
+    pub fn unwrap(self) -> T
+    {
+        self.inner.unwrap()
+    }
 }
diff --git a/src/writer.rs b/src/writer.rs
index 8de35b4a..773d458c 100644
--- a/src/writer.rs
+++ b/src/writer.rs
@@ -33,7 +33,7 @@ enum GenericZipWriter<W>
 ///     try!(zip.write(b"Hello, World!"));
 ///
 ///     // Optionally finish the zip. (this is also done on drop)
-///     try!(zip.finalize());
+///     try!(zip.finish());
 ///
 ///     Ok(())
 /// }
@@ -158,7 +158,17 @@ impl<W: Writer+Seek> ZipWriter<W>
     }
 
     /// Finish the last file and write all other zip-structures
-    pub fn finalize(&mut self) -> IoResult<()>
+    ///
+    /// This will return the writer, but one should normally not append any data to the end of the file.
+    /// Note that the zipfile will also be finished on drop.
+    pub fn finish(mut self) -> IoResult<W>
+    {
+        try!(self.finalize());
+        let inner = mem::replace(&mut self.inner, Closed);
+        Ok(inner.unwrap())
+    }
+
+    fn finalize(&mut self) -> IoResult<()>
     {
         try!(self.finish_file());
 
@@ -186,7 +196,6 @@ impl<W: Writer+Seek> ZipWriter<W>
             try!(footer.write(writer));
         }
 
-        self.inner = Closed;
         Ok(())
     }
 }
@@ -245,4 +254,13 @@ impl<W: Writer+Seek> GenericZipWriter<W>
             _ => fail!("Should have switched to stored beforehand"),
         }
     }
+
+    fn unwrap(self) -> W
+    {
+        match self
+        {
+            Storer(w) => w,
+            _ => fail!("Should have switched to stored beforehand"),
+        }
+    }
 }