diff --git a/configure.ac b/configure.ac
index 245bf917a23..5771af34616 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2034,6 +2034,7 @@ AC_CONFIG_FILES([configs/current
 		src/gallium/winsys/svga/drm/Makefile
 		src/gallium/winsys/sw/Makefile
 		src/gallium/winsys/sw/dri/Makefile
+		src/gallium/winsys/sw/fbdev/Makefile
 		src/gbm/Makefile
 		src/gbm/main/gbm.pc
 		src/glsl/Makefile
diff --git a/src/gallium/winsys/sw/fbdev/.gitignore b/src/gallium/winsys/sw/fbdev/.gitignore
new file mode 100644
index 00000000000..f3c7a7c5da6
--- /dev/null
+++ b/src/gallium/winsys/sw/fbdev/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/winsys/sw/fbdev/Makefile b/src/gallium/winsys/sw/fbdev/Makefile
deleted file mode 100644
index 8832aab1934..00000000000
--- a/src/gallium/winsys/sw/fbdev/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = fbdev
-
-LIBRARY_INCLUDES =
-
-LIBRARY_DEFINES =
-
-C_SOURCES = \
-	fbdev_sw_winsys.c
-
-include ../../../Makefile.template
diff --git a/src/gallium/winsys/sw/fbdev/Makefile.am b/src/gallium/winsys/sw/fbdev/Makefile.am
new file mode 100644
index 00000000000..ec06f7e5713
--- /dev/null
+++ b/src/gallium/winsys/sw/fbdev/Makefile.am
@@ -0,0 +1,34 @@
+# Copyright © 2012 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CPPFLAGS = \
+	$(GALLIUM_CFLAGS)
+
+noinst_LTLIBRARIES = libfbdev.la
+
+libfbdev_la_SOURCES = fbdev_sw_winsys.c
+
+#XXX: Delete this when all targets using the fbdev winsys are converted to automake.
+all-local: libfbdev.la
+	ln -f $(builddir)/.libs/libfbdev.a $(builddir)/libfbdev.a