diff --git a/.gitignore b/.gitignore
index 9b891d8..f402566 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 *.gmo
 *.m4
 stamp-h1
-src/clipit
+src/clipboard
 src/.deps
 config.*
 configure
diff --git a/configure.ac b/configure.ac
index f72ad78..9a743d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,8 +31,8 @@ ALL_LINGUAS="ca cs da de es es_ES et fr hu it ja nb pl pl pt_BR ro ru sv tr zh_C
 AM_GLIB_GNU_GETTEXT()
 AC_PROG_INTLTOOL([0.23])
 
-clipitlocaledir='${prefix}/${DATADIRNAME}/locale'
-AC_SUBST(clipitlocaledir)
+clipboardlocaledir='${prefix}/${DATADIRNAME}/locale'
+AC_SUBST(clipboardlocaledir)
 
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION(0.18.1)
diff --git a/src/Makefile.am b/src/Makefile.am
index 36933a0..d5f2b39 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,15 +1,15 @@
 AM_CPPFLAGS = -I$(top_srcdir)
-AM_CFLAGS = -Wall -g -DCLIPITLOCALEDIR=\""$(clipitlocaledir)"\"
+AM_CFLAGS = -Wall -g -DCLIPITLOCALEDIR=\""$(clipboardlocaledir)"\"
 ## FIXME!!!
 INCLUDES = $(GTK_CFLAGS) $(APPINDICATOR_CFLAGS)
 LDADD = $(GTK_LIBS) $(APPINDICATOR_LIBS) $(X11_LIBS)
 AM_LDFLAGS = -Wl,--as-needed
 
-bin_PROGRAMS = clipit
+bin_PROGRAMS = clipboard
 
 DISTCLEANFILES = *.bak *.log *~ .deps/*.P
 
-clipit_SOURCES = main.c main.h \
+clipboard_SOURCES = main.c main.h \
 			utils.c utils.h \
 			clipit-i18n.h\
 			daemon.c daemon.h \