diff --git a/applications/Decoder/Decoder.cs b/applications/Decoder/Decoder.cs
index bbdd40f7..28900395 100644
--- a/applications/Decoder/Decoder.cs
+++ b/applications/Decoder/Decoder.cs
@@ -37,7 +37,7 @@ using libsecondlife;
 class Decoder {
 	private static int BUFSIZE = 8096;
 
-	private static ProtocolManager protocol = new ProtocolManager("keywords.txt", "protocol.txt");
+	private static ProtocolManager protocol = new SecondLife("keywords.txt", "protocol.txt").Protocol;
 	private static string grep = null;
 	private static byte[] data = new byte[BUFSIZE];
 	private static byte[] temp = new byte[BUFSIZE];
diff --git a/applications/Decoder/build b/applications/Decoder/build
index 259c8fd0..34e4b04e 100755
--- a/applications/Decoder/build
+++ b/applications/Decoder/build
@@ -1,8 +1,11 @@
 #!/usr/bin/perl -w
 
-if (!-e '../../libsecondlife-cs/bin/Debug/libsecondlife.dll') {
-	die "*** libsecondlife-cs must be built first\n";
-}
+print "--- building libsecondlife-cs\n";
+
+system('cd ../../libsecondlife-cs && ./build')
+	and die "*** failed to build libsecondlife-cs\n";
+
+print "--- building Decoder\n";
 
 if (-e 'Decoder.exe' && -M '../../libsecondlife-cs/bin/Debug/libsecondlife.dll' < -M 'Decoder.exe') {
 	system('make clean')