diff --git a/util/superiotool/Makefile b/util/superiotool/Makefile
index fb5075d6b4..fa9853a90b 100644
--- a/util/superiotool/Makefile
+++ b/util/superiotool/Makefile
@@ -1,6 +1,43 @@
-CC:=gcc
-CFLAGS:=-O2 -Wall
-probe_superio: probe_superio.c
+##
+## This file is part of the LinuxBIOS project.
+##
+## Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+##
+
+PROGRAM = superiotool
+
+CC      = gcc
+INSTALL = /usr/bin/install
+PREFIX  = /usr/local
+
+# TODO: -ansi, -pedantic
+CFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \
+         -Werror-implicit-function-declaration
+
+all: $(PROGRAM)
+
+$(PROGRAM): $(PROGRAM).c
 	$(CC) $(CFLAGS) -o $@ $< 
+
+install: $(PROGRAM)
+	$(INSTALL) $(PROGRAM) $(PREFIX)/bin
+
 clean:
-	rm probe_superio
+	rm -f $(PROGRAM)
+
+.PHONY: all install clean
+
diff --git a/util/superiotool/probe_superio.c b/util/superiotool/superiotool.c
similarity index 100%
rename from util/superiotool/probe_superio.c
rename to util/superiotool/superiotool.c