diff --git a/bochs/Makefile.in b/bochs/Makefile.in
index 63307b037..fc3554823 100644
--- a/bochs/Makefile.in
+++ b/bochs/Makefile.in
@@ -530,12 +530,7 @@ zip:
 clean:
 	@RMCOMMAND@ *.o
 	@RMCOMMAND@ *.a
-	@RMCOMMAND@ bochs
-	@RMCOMMAND@ bochs.exe
-	@RMCOMMAND@ bximage
-	@RMCOMMAND@ bximage.exe
-	@RMCOMMAND@ niclist
-	@RMCOMMAND@ niclist.exe
+	@RMCOMMAND@ bochs@EXE@ bximage@EXE@ @OPTIONAL_TARGET@
 	@RMCOMMAND@ bochs.out
 	@RMCOMMAND@ bochsout.txt
 	@RMCOMMAND@ *.exp *.lib
diff --git a/bochs/configure b/bochs/configure
index 8dd9951ae..1b52fbd24 100755
--- a/bochs/configure
+++ b/bochs/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 13087 2017-02-27 22:26:43Z vruppert .
+# From configure.in Id: configure.in 13109 2017-03-12 07:48:08Z vruppert .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@@ -27316,5 +27316,7 @@ fi
 
 # Create some subdirectories for when you run configure from some other
 # directory (part #2).
+if test ! -d cpu/cpudb/amd; then mkdir cpu/cpudb/amd; fi
+if test ! -d cpu/cpudb/intel; then mkdir cpu/cpudb/intel; fi
 if test ! -d cpu/decoder; then mkdir cpu/decoder; fi
 if test ! -d iodev/network/slirp; then mkdir iodev/network/slirp; fi
diff --git a/bochs/configure.in b/bochs/configure.in
index d6b858c29..54565b916 100644
--- a/bochs/configure.in
+++ b/bochs/configure.in
@@ -3246,5 +3246,7 @@ AC_OUTPUT(Makefile iodev/Makefile iodev/display/Makefile iodev/hdimage/Makefile
 
 # Create some subdirectories for when you run configure from some other
 # directory (part #2).
+if test ! -d cpu/cpudb/amd; then mkdir cpu/cpudb/amd; fi
+if test ! -d cpu/cpudb/intel; then mkdir cpu/cpudb/intel; fi
 if test ! -d cpu/decoder; then mkdir cpu/decoder; fi
 if test ! -d iodev/network/slirp; then mkdir iodev/network/slirp; fi
diff --git a/bochs/cpu/cpudb/Makefile.in b/bochs/cpu/cpudb/Makefile.in
index 2c425c6b8..9c47d4769 100644
--- a/bochs/cpu/cpudb/Makefile.in
+++ b/bochs/cpu/cpudb/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2015 The Bochs Project
+# Copyright (C) 2015-2017 The Bochs Project
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -76,7 +76,8 @@ libcpudb.a: $(CPUDB_OBJS)
 $(CPUDB_OBJS): $(BX_INCLUDES)
 
 clean:
-	@RMCOMMAND@ *.o
+	@RMCOMMAND@ amd/*.o
+	@RMCOMMAND@ intel/*.o
 	@RMCOMMAND@ *.a
 
 dist-clean: clean