diff --git a/NEWS b/NEWS
index 24c164378..5c280685f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+Mar 27, 2012: libarchive 3.0.4 released
+
 Feb 05, 2012: libarchive development now hosted at GitHub.
     http://libarchive.github.com/
 Feb 05, 2012: libarchive's issue tracker remains at Google Code.
diff --git a/build/version b/build/version
index 9f2dfc136..f0f9f2611 100644
--- a/build/version
+++ b/build/version
@@ -1 +1 @@
-3000200a
+3000004
diff --git a/configure.ac b/configure.ac
index 21481241e..4993c2595 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,8 +4,8 @@ dnl First, define all of the version numbers up front.
 dnl In particular, this allows the version macro to be used in AC_INIT
 
 dnl These first two version numbers are updated automatically on each release.
-m4_define([LIBARCHIVE_VERSION_S],[3.0.200a])
-m4_define([LIBARCHIVE_VERSION_N],[3000200])
+m4_define([LIBARCHIVE_VERSION_S],[3.0.4])
+m4_define([LIBARCHIVE_VERSION_N],[3000004])
 
 dnl bsdtar and bsdcpio versioning tracks libarchive
 m4_define([BSDTAR_VERSION_S],LIBARCHIVE_VERSION_S())
diff --git a/libarchive/archive.h b/libarchive/archive.h
index e28037b62..d5316ca93 100644
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -118,13 +118,13 @@ extern "C" {
  * assert that ARCHIVE_VERSION_NUMBER >= 2012108.
  */
 /* Note: Compiler will complain if this does not match archive_entry.h! */
-#define	ARCHIVE_VERSION_NUMBER 3000200
+#define	ARCHIVE_VERSION_NUMBER 3000004
 __LA_DECL int		archive_version_number(void);
 
 /*
  * Textual name/version of the library, useful for version displays.
  */
-#define	ARCHIVE_VERSION_STRING "libarchive 3.0.200a"
+#define	ARCHIVE_VERSION_STRING "libarchive 3.0.4"
 __LA_DECL const char *	archive_version_string(void);
 
 /* Declare our basic types. */
diff --git a/libarchive/archive_entry.h b/libarchive/archive_entry.h
index 7393c2b5f..5fd7cab0d 100644
--- a/libarchive/archive_entry.h
+++ b/libarchive/archive_entry.h
@@ -29,7 +29,7 @@
 #define	ARCHIVE_ENTRY_H_INCLUDED
 
 /* Note: Compiler will complain if this does not match archive.h! */
-#define	ARCHIVE_VERSION_NUMBER 3000200
+#define	ARCHIVE_VERSION_NUMBER 3000004
 
 /*
  * Note: archive_entry.h is for use outside of libarchive; the