diff --git a/common/rfb/JpegCompressor.h b/common/rfb/JpegCompressor.h
index 93fdc7b..93f6dec 100644
--- a/common/rfb/JpegCompressor.h
+++ b/common/rfb/JpegCompressor.h
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 extern "C" {
-#include <jpeg/jpeglib.h>
+#include <jpeglib.h>
 }
 
 #include <rdr/types.h>
diff --git a/common/rfb/Logger.cxx b/common/rfb/Logger.cxx
index 52d3308..de6d1af 100644
--- a/common/rfb/Logger.cxx
+++ b/common/rfb/Logger.cxx
@@ -18,6 +18,10 @@
 
 // -=- Logger.cxx - support for the Logger and LogWriter classes
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/common/rfb/Makefile.am b/common/rfb/Makefile.am
new file mode 100644
index 0000000..a981b15
--- /dev/null
+++ b/common/rfb/Makefile.am
@@ -0,0 +1,55 @@
+noinst_LTLIBRARIES = librfb.la
+
+librfb_la_SOURCES = Blacklist.cxx Blacklist.h CapsContainer.cxx \
+	CapsContainer.h CapsList.cxx CapsList.h CConnection.cxx CConnection.h \
+	CFTMsgReader.cxx CFTMsgReader.h CFTMsgWriter.cxx CFTMsgWriter.h \
+	CMsgHandler.cxx CMsgHandler.h CMsgReader.cxx CMsgReader.h \
+	CMsgReaderV3.cxx CMsgReaderV3.h CMsgWriter.cxx CMsgWriter.h \
+	CMsgWriterV3.cxx CMsgWriterV3.h ColourCube.h ColourMap.h \
+	ComparingUpdateTracker.cxx ComparingUpdateTracker.h Configuration.cxx \
+	Configuration.h ConnParams.cxx ConnParams.h CSecurity.h \
+	CSecurityNone.h CSecurityVncAuth.cxx CSecurityVncAuth.h Cursor.cxx \
+	Cursor.h Decoder.cxx Decoder.h DirManager.h d3des.c d3des.h \
+	Encoder.cxx Encoder.h encodings.cxx encodings.h Exception.h \
+	FileInfo.cxx FileInfo.h FileManager.cxx FileManager.h FileReader.cxx \
+	FileReader.h FileWriter.cxx FileWriter.h fttypes.h hextileConstants.h \
+	hextileDecode.h HextileDecoder.cxx HextileDecoder.h \
+	hextileEncodeBetter.h hextileEncode.h HextileEncoder.cxx \
+	HextileEncoder.h Hostname.h HTTPServer.cxx HTTPServer.h ImageGetter.h \
+	InputHandler.h JpegCompressor.cxx JpegCompressor.h JpegEncoder.cxx \
+	JpegEncoder.h KeyRemapper.cxx KeyRemapper.h keysymdef.h \
+	ListConnInfo.h Logger.cxx Logger_file.cxx Logger_file.h Logger.h \
+	Logger_stdio.cxx Logger_stdio.h LogWriter.cxx LogWriter.h msgTypes.h \
+	Password.cxx Password.h PixelBuffer.cxx PixelBuffer.h PixelFormat.cxx \
+	PixelFormat.h Pixel.h RawDecoder.cxx RawDecoder.h RawEncoder.cxx \
+	RawEncoder.h Rect.h Region.cxx Region.h rreDecode.h RREDecoder.cxx \
+	RREDecoder.h rreEncode.h RREEncoder.cxx RREEncoder.h \
+	ScaledPixelBuffer.cxx ScaledPixelBuffer.h ScaleFilters.cxx \
+	ScaleFilters.h SConnection.cxx SConnection.h SDesktop.h secTypes.cxx \
+	secTypes.h ServerCore.cxx ServerCore.h SFileTransfer.cxx \
+	SFileTransfer.h SFileTransferManager.cxx SFileTransferManager.h \
+	SFTMsgReader.cxx SFTMsgReader.h SFTMsgWriter.cxx SFTMsgWriter.h \
+	SMsgHandler.cxx SMsgHandler.h SMsgReader.cxx SMsgReader.h \
+	SMsgReaderV3.cxx SMsgReaderV3.h SMsgWriter.cxx SMsgWriter.h \
+	SMsgWriterV3.cxx SMsgWriterV3.h SSecurityFactoryStandard.cxx \
+	SSecurityFactoryStandard.h SSecurity.h SSecurityNone.h \
+	SSecurityVncAuth.cxx SSecurityVncAuth.h Threading.h tightDecode.h \
+	TightDecoder.cxx TightDecoder.h tightEncode.h TightEncoder.cxx \
+	TightEncoder.h TightPalette.cxx TightPalette.h Timer.cxx Timer.h \
+	TransferQueue.cxx TransferQueue.h TransImageGetter.cxx \
+	TransImageGetter.h transInitTempl.h transTempl.h TrueColourMap.h \
+	UpdateTracker.cxx UpdateTracker.h UserPasswdGetter.h util.cxx util.h \
+	VNCSConnectionST.cxx VNCSConnectionST.h VNCServer.h VNCServerST.cxx \
+	VNCServerST.h zrleDecode.h ZRLEDecoder.cxx ZRLEDecoder.h zrleEncode.h \
+	ZRLEEncoder.cxx ZRLEEncoder.h
+
+if CL
+librfb_la_SOURCES += IrixCLJpegCompressor.cxx IrixCLJpegCompressor.h
+endif
+
+if DMEDIA
+librfb_la_SOURCES += IrixDMIC_RawToJpeg.cxx IrixDMIC_RawToJpeg.h \
+	IrixDMJpegCompressor.cxx IrixDMJpegCompressor.h
+endif
+
+librfb_la_CPPFLAGS = -I$(COMMON_DIR)
diff --git a/common/rfb/Makefile.in b/common/rfb/Makefile.in
deleted file mode 100644
index 65dfafc..0000000
--- a/common/rfb/Makefile.in
+++ /dev/null
@@ -1,88 +0,0 @@
-
-CXXSRCS = \
-  Blacklist.cxx \
-  CConnection.cxx \
-  CMsgHandler.cxx \
-  CMsgReader.cxx \
-  CMsgReaderV3.cxx \
-  CMsgWriter.cxx \
-  CMsgWriterV3.cxx \
-  CSecurityVncAuth.cxx \
-  CapsContainer.cxx \
-  CapsList.cxx \
-  ComparingUpdateTracker.cxx \
-  Configuration.cxx \
-  ConnParams.cxx \
-  Cursor.cxx \
-  Decoder.cxx \
-  Encoder.cxx \
-  FileInfo.cxx \
-  FileManager.cxx \
-  FileReader.cxx \
-  FileWriter.cxx \
-  JpegCompressor.cxx \
-  JpegEncoder.cxx \
-  HTTPServer.cxx \
-  HextileDecoder.cxx \
-  HextileEncoder.cxx \
-  KeyRemapper.cxx \
-  LogWriter.cxx \
-  Logger.cxx \
-  Logger_file.cxx \
-  Logger_stdio.cxx \
-  Password.cxx \
-  PixelBuffer.cxx \
-  PixelFormat.cxx \
-  RREEncoder.cxx \
-  RREDecoder.cxx \
-  RawDecoder.cxx \
-  RawEncoder.cxx \
-  Region.cxx \
-  SConnection.cxx \
-  SFTMsgReader.cxx \
-  SFTMsgWriter.cxx \
-  SFileTransfer.cxx \
-  SFileTransferManager.cxx \
-  SMsgHandler.cxx \
-  SMsgReader.cxx \
-  SMsgReaderV3.cxx \
-  SMsgWriter.cxx \
-  SMsgWriterV3.cxx \
-  ServerCore.cxx \
-  SSecurityFactoryStandard.cxx \
-  SSecurityVncAuth.cxx \
-  ScaledPixelBuffer.cxx \
-  ScaleFilters.cxx \
-  Timer.cxx \
-  TightDecoder.cxx \
-  TightEncoder.cxx \
-  TightPalette.cxx \
-  TransImageGetter.cxx \
-  TransferQueue.cxx \
-  UpdateTracker.cxx \
-  VNCSConnectionST.cxx \
-  VNCServerST.cxx \
-  ZRLEEncoder.cxx \
-  ZRLEDecoder.cxx \
-  encodings.cxx \
-  secTypes.cxx \
-  util.cxx \
-  @PLATFORM_CXXSRCS@
-
-SRCS = d3des.c $(CXXSRCS)
-
-OBJS = d3des.o $(CXXSRCS:.cxx=.o)
-
-DIR_CPPFLAGS = -I$(top_srcdir) @JPEG_INCLUDE@ @VSNPRINTF_DEFINE@ \
-  @STRCASECMP_DEFINE@ @STRNCASECMP_DEFINE@
-
-library = librfb.a
-
-all:: $(library)
-
-$(library): $(OBJS)
-	rm -f $(library)
-	$(AR) $(library) $(OBJS)
-	$(RANLIB) $(library)
-
-# followed by boilerplate.mk
diff --git a/common/rfb/util.h b/common/rfb/util.h
index fa205f0..4124769 100644
--- a/common/rfb/util.h
+++ b/common/rfb/util.h
@@ -23,6 +23,10 @@
 #ifndef __RFB_UTIL_H__
 #define __RFB_UTIL_H__
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <limits.h>
 #include <string.h>