Index: src/atheme.c
===================================================================
--- src/atheme.c.orig
+++ src/atheme.c
@@ -348,7 +348,7 @@
 		slog(LG_INFO, "main(): restarting");
 
 #ifndef _WIN32
-		execve("bin/atheme", argv, environ);
+		execve(BINDIR "/atheme", argv, environ);
 #endif
 	}
 
Index: src/Makefile.in
===================================================================
--- src/Makefile.in.orig
+++ src/Makefile.in
@@ -27,7 +27,7 @@
 SHAREDIR	= @SHAREDIR@
 BIN		= atheme@EXEEXT@
 MKDEP		= @MKDEP@
-CFLAGS		= @CFLAGS@ -I../include -I../libatheme @PGINC@
+CFLAGS		= @CFLAGS@ -I../include -I../libatheme @PGINC@ -DBINDIR=\"$(bindir)\"
 
 VERSION		= @PACKAGE_VERSION@