diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4e578d23..39ff4dcb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -308,6 +308,8 @@ set(SOURCES
     usbtiny.h
     usbtiny.c
     update.c
+    whereami.c
+    whereami.h
     wiring.h
     wiring.c
     xbee.h
@@ -359,8 +361,6 @@ add_executable(avrdude
     developer_opts.c
     developer_opts.h
     developer_opts_private.h
-    whereami.c
-    whereami.h
     ${CMAKE_CURRENT_BINARY_DIR}/ac_cfg.h
     ${EXTRA_WINDOWS_RESOURCES}
     )
diff --git a/src/Makefile.am b/src/Makefile.am
index 9ec64295..7e89b328 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -229,6 +229,8 @@ libavrdude_la_SOURCES = \
 	usbtiny.h \
 	usbtiny.c \
 	update.c \
+	whereami.c \
+	whereami.h \
 	wiring.h \
 	wiring.c \
 	xbee.h \
@@ -240,8 +242,6 @@ include_HEADERS += libavrdude-avrintel.h
 
 avrdude_SOURCES = \
 	main.c \
-	whereami.c \
-	whereami.h \
 	developer_opts.c \
 	developer_opts.h \
 	developer_opts_private.h