diff --git a/commonsh/02_term b/commonsh/02_term
index ce34a9d..2cd7d5f 100755
--- a/commonsh/02_term
+++ b/commonsh/02_term
@@ -71,8 +71,9 @@ if command -v infocmp >/dev/null 2>&1 ; then
 			TERM="xterm-256color"
 		fi
 	else
-		if command -v answerback >/dev/null 2>&1 ; then
-			ANSWERBACK=`answerback`
+		answerback_cmd="answerback.`uname -s`"
+		if command -v ${answerback_cmd} >/dev/null 2>&1 ; then
+			ANSWERBACK=`${answerback_cmd} 2>/dev/null`
 			export ANSWERBACK
 		fi
 	fi
diff --git a/install.pl b/install.pl
index 0647de1..81b1934 100755
--- a/install.pl
+++ b/install.pl
@@ -84,8 +84,6 @@ my %links = (
 	'git-info'            => 'bin/git-info',
 	'git-untrack-ignored' => 'bin/git-untracked-ignored',
 
-	answerback => 'bin/answerback',
-
 	gdbinit => '.gdbinit',
 );
 
@@ -96,8 +94,14 @@ if ($contained) {
 	($prefix) = $prefix =~ m{^\/? (.+) [^/]+ $}x;
 }
 
-`make answerback`;
-warn "Could not compile answerback.\n" if ($? != 0);
+chomp(my $uname = `uname -s`);
+`cc answerback.c -o answerback.$uname`;
+if ($? != 0) {
+	warn "Could not compile answerback.\n";
+} else {
+	$links{"answerback.$uname"} = "bin/answerback.$uname";
+}
+
 
 my $i = 0; # Keep track of how many links we added
 for my $file (keys %links) {