diff --git a/HISTORY b/HISTORY
index 72a0cb9..fec20ca 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,16 @@
+OpenPAM Figwort							2005-06-16
+
+ - BUGFIX: Correct several small signedness and initialization bugs
+   discovered during review by the NetBSD team.
+
+ - BUGFIX: Modify gendoc.pl to sort cross-references in dictionary
+   order within each section.
+
+ - ENHANCE: if a policy specifies a relative module path, prepend the
+   module directory so we never call dlopen(3) with a relative path.
+
+ - ENHANCE: add a pam.conf(5) manual page.
+============================================================================
 OpenPAM Feterita						2005-02-01
 
  - BUGFIX: Correct numerous markup errors, invalid cross-references,
@@ -16,7 +29,6 @@ OpenPAM Feterita						2005-02-01
  - ENHANCE: Minor overhaul of the autoconf / build system.
 
  - ENHANCE: Add openpam_free_envlist(3).
-
 ============================================================================
 OpenPAM Eelgrass						2004-02-10
 
@@ -292,4 +304,4 @@ OpenPAM	Calamite						2002-02-09
 
 First (beta) release.
 ============================================================================
-$P4: //depot/projects/openpam/HISTORY#23 $
+$P4: //depot/projects/openpam/HISTORY#24 $
diff --git a/RELNOTES b/RELNOTES
index 56e2841..a8aa9f1 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,6 +1,6 @@
 
-		  Release notes for OpenPAM Feterita
-		  ==================================
+		  Release notes for OpenPAM Figwort
+		  =================================
 
 This release corresponds to the code used in FreeBSD-CURRENT as of the
 release date.  It has also been tested on several other platforms, and
@@ -26,4 +26,4 @@ proper credit for your contribution.
 
 Please direct bug reports and inquiries to <des@freebsd.org>.
 
-$P4: //depot/projects/openpam/RELNOTES#21 $
+$P4: //depot/projects/openpam/RELNOTES#22 $
diff --git a/include/security/openpam_version.h b/include/security/openpam_version.h
index 2832bbd..b7b3e8e 100644
--- a/include/security/openpam_version.h
+++ b/include/security/openpam_version.h
@@ -31,14 +31,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/openpam_version.h#13 $
+ * $P4: //depot/projects/openpam/include/security/openpam_version.h#14 $
  */
 
 #ifndef _OPENPAM_VERSION_H_INCLUDED
 #define _OPENPAM_VERSION_H_INCLUDED
 
 #define _OPENPAM
-#define _OPENPAM_VERSION	20050201
-#define _OPENPAM_RELEASE	"Feterita"
+#define _OPENPAM_VERSION	20050616
+#define _OPENPAM_RELEASE	"Figwort"
 
 #endif