diff --git a/configure.in b/configure.in
index a4eed1614..e2d9475f5 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(include/rig.h)
-AM_INIT_AUTOMAKE(hamlib, 1.1.0)
+AC_INIT(include/hamlib/rig.h)
+# version code:
+V_MAJOR=1
+V_MINOR=1.0
+AM_INIT_AUTOMAKE(hamlib, ${V_MAJOR}.${V_MINOR})
 AM_CONFIG_HEADER(include/config.h)
 AC_PREREQ(2.10)dnl              dnl Minimum Autoconf version required.
 AC_ARG_PROGRAM
@@ -17,7 +20,7 @@ AC_MINIX
 AC_ISC_POSIX
 
 INCLUDES="${INCLUDES} -I/usr/local/include -I../src"
-CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE"
+CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE -DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR}"
 if test "${ac_cv_prog_gcc}" = "yes"; then
   CFLAGS="${CFLAGS} -Wall"
 fi