diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index b6bfa049ebd..b1565d3eb5e 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -167,10 +167,8 @@ int main(int argc, char **argv)
 
     gcc_argv = strarray_alloc();
 
-    i = 0;
     if (linking)
     {
-	int has_output_name = 0;
 	int has_input_files = 0;
 
 	strarray *copy_argv;
@@ -202,7 +200,6 @@ int main(int argc, char **argv)
 			argv[j] = 0;
 			strarray_add(gcc_argv, argv[++j]);
 		    }
-		    has_output_name = 1;
 		    argv[j] = 0;
 		    break;
 		case 'l':
@@ -223,12 +220,6 @@ int main(int argc, char **argv)
 
 	if (has_input_files)
 	{
-	    /* Support the a.out default name, to appease configure */
-	    if (!has_output_name)
-	    {
-		strarray_add(gcc_argv, "-o");
-		strarray_add(gcc_argv, "a.out");
-	    }
 	    if (use_stdlib && use_msvcrt) strarray_add(gcc_argv, "-lmsvcrt");
 	    if (gui_app) strarray_add(gcc_argv, "-lcomdlg32");
 	    strarray_add(gcc_argv, "-ladvapi32");
diff --git a/tools/winegcc/winewrap.c b/tools/winegcc/winewrap.c
index 496910c108a..bf7a51a6f92 100644
--- a/tools/winegcc/winewrap.c
+++ b/tools/winegcc/winewrap.c
@@ -210,7 +210,7 @@ static const char *wrapper_code =
     "}\n"
 ;
 
-static char *output_name;
+static char *output_name = "a.out";
 static strarray *arh_files, *dll_files, *lib_files, *llib_paths, *lib_paths, *obj_files;
 static int keep_generated = 0;