diff --git a/bootstrap b/bootstrap
index 07a1ed6..06d1fdb 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,5 +1,5 @@
 #! /bin/sh -e
 libtoolize
-aclocal
+aclocal$automake_version
 autoconf
-automake -a --foreign
+automake$automake_version -a --foreign
diff --git a/configure.ac b/configure.ac
index d9ebebc..a002b41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,5 @@
-AC_INIT(src/google/protobuf-c/protobuf-c.h)
-PROTOBUF_C_VERSION=0.10
-
-AM_INIT_AUTOMAKE(protobuf-c, $PROTOBUF_C_VERSION)
+AC_INIT([protobuf-c], [0.10])
+AM_INIT_AUTOMAKE([1.9 foreign])
 PACKAGE=protobuf-c
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/src/Makefile.am b/src/Makefile.am
index e183623..2fde3a7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,7 +32,9 @@ google/protobuf-c/protobuf-c.c
 # but suffice it to say this is needed
 # on a few garbage platforms (AIX, windows),
 # and it compiles to a no-op on sensible platforms (elf)
-libprotobuf_c_la_LDFLAGS = -no-undefined
+libprotobuf_c_la_LDFLAGS = \
+-no-undefined \
+-version-info 0:0:0
 
 noinst_HEADERS = \
 google/protobuf/compiler/c/c_message_field.h \
diff --git a/src/google/protobuf-c/protobuf-c-rpc.c b/src/google/protobuf-c/protobuf-c-rpc.c
index 3e01e47..5e2e155 100644
--- a/src/google/protobuf-c/protobuf-c-rpc.c
+++ b/src/google/protobuf-c/protobuf-c-rpc.c
@@ -404,8 +404,7 @@ begin_name_lookup (ProtobufC_RPC_Client *client)
     }
 }
 
-
-void
+static void
 handle_init_idle (ProtobufCDispatch *dispatch,
                   void              *data)
 {
@@ -1215,7 +1214,7 @@ server_new_from_fd (ProtobufC_FD              listening_fd,
    XXX: we should survey what others do here... like x-windows...
  */
 /* NOTE: stolen from gsk, obviously */
-void
+static void
 _gsk_socket_address_local_maybe_delete_stale_socket (const char *path,
                                                      struct sockaddr *addr,
                                                      unsigned addr_len)