diff --git a/fish_tests.c b/fish_tests.c
index 4b849d41a..c10096410 100644
--- a/fish_tests.c
+++ b/fish_tests.c
@@ -622,7 +622,7 @@ int main( int argc, char **argv )
 	complete_init();
 	reader_init();
 	env_init();
-	
+
 	test_util();
 	test_tok();
 	test_parser();
diff --git a/fishd.c b/fishd.c
index b99bd4e0b..e9003bc17 100644
--- a/fishd.c
+++ b/fishd.c
@@ -296,7 +296,7 @@ static void daemonize()
 	/*
 	  Put ourself in out own processing group
 	*/
-	setpgrp();
+	setpgid( 0, 0 );
 
 	/*
 	  Close stdin and stdout