diff --git a/configure.ac b/configure.ac
index b92eeba..f29068e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT(astro, 0.1, stv0g@0l.de)
-AC_CONFIG_SRCDIR([src/astro.c])
+AC_INIT(sun, 0.1, post@steffenvogel.de)
+AC_CONFIG_SRCDIR([src/sun_main.c])
 AC_CONFIG_HEADERS([config.h])
 
 # Checks for programs.
diff --git a/src/Makefile.am b/src/Makefile.am
index bc1016b..03eb786 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,7 @@
-bin_PROGRAMS = astro sun geonames
+bin_PROGRAMS = sun geonames
 
-astro_SOURCES = calendar.c astro.c
-astro_LDADD = -lm
+sun_SOURCES = sun_main.c sun.c geonames.c
+sun_LDADD = -lm -lcurl -ljson
 
-sun_SOURCES = sun.c
-sun_LDADD = -lm
-
-geonames_SOURCES = geonames_test.c geonames.c
+geonames_SOURCES = geonames_main.c geonames.c
 geonames_LDADD = -lcurl -ljson