diff --git a/bandb/Makefile.in b/bandb/Makefile.in
index 3d45e2822..1bb034285 100644
--- a/bandb/Makefile.in
+++ b/bandb/Makefile.in
@@ -46,22 +46,16 @@ PROGS		= $(pkglibexec_PROGS) $(bin_PROGS)
 BANDB_SOURCES =     \
   bandb.c	\
   rsdb_snprintf.c \
-  rsdb_sqlite3.c
-
-ifndef SQLITE_LIB
-	BANDB_SOURCES+=sqlite3.c
-endif
+  rsdb_sqlite3.c \
+  @SQLITE_SRC@
 
 BANDB_OBJECTS = ${BANDB_SOURCES:.c=.o}
 
 BANTOOL_SOURCES =     \
   bantool.c	\
   rsdb_snprintf.c \
-  rsdb_sqlite3.c
-
-ifndef SQLITE_LIB
-	BANTOOL_SOURCES+=sqlite3.c
-endif
+  rsdb_sqlite3.c \
+  @SQLITE_SRC@
 
 BANTOOL_OBJECTS = ${BANTOOL_SOURCES:.c=.o}
 
diff --git a/configure b/configure
index e0d32d891..5c3fdcf90 100755
--- a/configure
+++ b/configure
@@ -642,6 +642,7 @@ HELP_DIR
 logdir
 LOG_DIR
 ETC_DIR
+SQLITE_SRC
 SQLITE_LD
 ZLIB_LD
 ENCSPEED
@@ -7312,6 +7313,11 @@ fi
 
 
 
+fi
+
+if test "$shared_sqlite" = no; then
+    SQLITE_SRC=sqlite3.c
+
 fi
 
 
diff --git a/configure.ac b/configure.ac
index 2fa76a453..60706e600 100644
--- a/configure.ac
+++ b/configure.ac
@@ -579,6 +579,10 @@ AC_CHECK_HEADER(sqlite3.h, [
 
 fi
 
+if test "$shared_sqlite" = no; then
+    AC_SUBST(SQLITE_SRC, sqlite3.c)
+fi
+
 dnl IO Loop Selection
 dnl =================