diff --git a/configure.ac b/configure.ac
index b8134c61..4a483a08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl This config.in requires autoconf 2.5 or greater.
 
 AC_PREREQ(2.60)
-AC_INIT(qpdf,2.2.4)
+AC_INIT(qpdf,2.3.a1)
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_FILES([autoconf.mk])
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index 9bdbbdb6..d614efe5 100644
--- a/libqpdf/QPDF.cc
+++ b/libqpdf/QPDF.cc
@@ -15,7 +15,7 @@
 #include <qpdf/QPDF_Null.hh>
 #include <qpdf/QPDF_Dictionary.hh>
 
-std::string QPDF::qpdf_version = "2.2.4";
+std::string QPDF::qpdf_version = "2.3.a1";
 
 void
 QPDF::InputSource::setLastOffset(off_t offset)
diff --git a/make_dist b/make_dist
index e6c489ff..9296c5ad 100755
--- a/make_dist
+++ b/make_dist
@@ -5,13 +5,13 @@
 #
 
 require 5.008;
-BEGIN { $^W = 1; }
+use warnings;
 use strict;
+use File::Basename;
 use Cwd;
 use IO::File;
 
-my $whoami = ($0 =~ m,([^/\\]*)$,) ? $1 : $0;
-#my $dirname = ($0 =~ m,(.*)[/\\][^/\\]+$,) ? $1 : ".";
+my $whoami = basename($0);
 
 usage() unless @ARGV >= 1;
 my $srcdir = shift(@ARGV);
diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index bbfee5d1..3bac351a 100644
--- a/manual/qpdf-manual.xml
+++ b/manual/qpdf-manual.xml
@@ -5,8 +5,8 @@
 <!ENTITY mdash "&#x2014;">
 <!ENTITY ndash "&#x2013;">
 <!ENTITY nbsp "&#xA0;">
-<!ENTITY swversion "2.2.4">
-<!ENTITY lastreleased "June 25, 2011">
+<!ENTITY swversion "2.3.a1">
+<!ENTITY lastreleased "August 10, 2011">
 ]>
 <book>
  <bookinfo>
diff --git a/qpdf.spec b/qpdf.spec
index 2eeeb404..983c6770 100644
--- a/qpdf.spec
+++ b/qpdf.spec
@@ -1,6 +1,6 @@
 Summary: Command-line tools and library for transforming PDF files
 Name: qpdf
-Version: 2.2.4
+Version: 2.3.a1
 Release: 1%{?dist}
 License: Artistic
 Group: System Environment/Libraries