diff --git a/src/Makefile.am b/src/Makefile.am
index 852f0de..6ccb6e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,10 +16,12 @@
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include -rdynamic
-
 LDFLAGS += $(SQLITE_LIBS) -lpthread -rdynamic
+cgidir := $(localstatedir)/www/cgi-bin
+wwwdir := $(localstatedir)/www/html
 
-bin_PROGRAMS = distromatic distroquery
+bin_PROGRAMS = distromatic
+cgi_PROGRAMS = distroquery
 
 distromatic_SOURCES = \
   buildtools.c \
@@ -33,14 +35,11 @@ distromatic_SOURCES = \
   backend-sqlite3.c
 
 distroquery_SOURCES = \
-  buildtools.c \
-  changelog.c \
   distroquery.c \
   functions.c \
-  reports.c \
   headerlist.c \
   requirelist.c \
   rpmfunctions.c \
-  backend-sqlite3.c
+  changelog.c
 
 SUBDIRS = include missing