diff -u --recursive ../orig/Makefile ./Makefile
--- ../orig/Makefile	2008-01-19 16:17:57.000000000 -0800
+++ ./Makefile	2008-01-19 15:56:00.000000000 -0800
@@ -25,7 +25,7 @@
 OPTIONS=	CLIENT "Build client" on \
 		CELLSHADING "Enable Cell Shading effect" off \
 		CURL "Enable curl support" on \
-		CURL_DLOPEN "Enable dynamic loading of curl" on \
+		CURL_DLOPEN "Enable dynamic loading of curl (broken?)" off \
 		GAMELIBS "Build game libraries (when not mandatory)" off \
 		DEDICATED "Build dedicated server" on \
 		MP3 "Enable MP3 support" off \
diff -u --recursive ../orig/files/patch-Makefile ./files/patch-Makefile
--- ../orig/files/patch-Makefile	2008-01-19 16:18:04.000000000 -0800
+++ ./files/patch-Makefile	2008-01-19 15:15:58.000000000 -0800
@@ -1,5 +1,5 @@
---- Makefile.orig	Sun Dec 16 18:09:18 2007
-+++ Makefile	Fri Jan  4 10:40:41 2008
+--- Makefile.orig	2008-01-19 15:13:14.000000000 -0800
++++ Makefile	2008-01-19 15:13:28.000000000 -0800
 @@ -27,16 +27,22 @@
    endif
  endif
@@ -128,7 +128,18 @@
  
    ifeq ($(USE_OPENAL),1)
      BASE_CFLAGS += -DUSE_OPENAL=1
-@@ -520,45 +504,61 @@
+@@ -516,49 +500,78 @@
+     endif
+   endif
+ 
++  ifeq ($(USE_CURL),1)
++    BASE_CFLAGS += -DUSE_CURL=1
++    ifeq ($(USE_CURL_DLOPEN),1)
++      BASE_CFLAGS += -DUSE_CURL_DLOPEN=1
++    endif
++  endif
++
+   ifeq ($(USE_CODEC_VORBIS),1)
      BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
    endif
  
@@ -208,10 +219,16 @@
      ifneq ($(USE_OPENAL_DLOPEN),1)
 -      CLIENT_LDFLAGS += $(THREAD_LDFLAGS) -lopenal
 +      CLIENT_LDFLAGS += -lopenal
++    endif
++  endif
++
++  ifeq ($(USE_CURL),1)
++    ifneq ($(USE_CURL_DLOPEN),1)
++      CLIENT_LDFLAGS += -lcurl
      endif
    endif
  
-@@ -566,7 +566,6 @@
+@@ -566,7 +579,6 @@
      CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
    endif
  
@@ -219,7 +236,7 @@
  else # ifeq freebsd
  
  #############################################################################
-@@ -717,24 +716,25 @@
+@@ -717,24 +729,25 @@
  TARGETS =
  
  ifneq ($(BUILD_SERVER),0)
@@ -256,7 +273,7 @@
  endif
  
  ifneq ($(BUILD_GAME_QVM),0)
-@@ -824,10 +824,10 @@
+@@ -824,10 +837,10 @@
  all: debug release
  
  debug:
@@ -269,7 +286,7 @@
  
  # Create the build directories and tools, print out
  # an informational message, then start building
-@@ -880,7 +880,7 @@
+@@ -880,7 +893,7 @@
  Q3LCC=$(TOOLSDIR)/q3lcc$(BINEXT)
  Q3ASM=$(TOOLSDIR)/q3asm$(BINEXT)
  
@@ -278,7 +295,7 @@
  tools:
  	@echo QVM tools not built when cross-compiling
  else
-@@ -943,8 +943,13 @@
+@@ -943,8 +956,13 @@
    $(B)/client/snd_main.o \
    $(B)/client/snd_codec.o \
    $(B)/client/snd_codec_wav.o \
@@ -294,7 +311,7 @@
    $(B)/client/qal.o \
    $(B)/client/snd_openal.o \
    \
-@@ -1078,9 +1083,15 @@
+@@ -1078,9 +1096,15 @@
    ifeq ($(ARCH),x86)
      Q3OBJ += $(B)/client/vm_x86.o
    endif
@@ -310,7 +327,7 @@
    ifeq ($(ARCH),ppc)
      Q3OBJ += $(B)/client/vm_ppc.o
    endif
-@@ -1113,7 +1124,7 @@
+@@ -1113,7 +1137,7 @@
  
    ifeq ($(USE_SDL),1)
      ifneq ($(PLATFORM),darwin)
@@ -319,7 +336,7 @@
      endif
    endif
  
-@@ -1126,12 +1137,12 @@
+@@ -1126,12 +1150,12 @@
      $(B)/clientsmp/sdl_glimp.o
  endif
  
@@ -334,7 +351,7 @@
  	$(echo_cmd) "LD $@"
  	$(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
  		$(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
-@@ -1248,7 +1259,7 @@
+@@ -1248,7 +1272,7 @@
    endif
  endif
  
@@ -343,7 +360,7 @@
  	$(echo_cmd) "LD $@"
  	$(Q)$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS)
  
-@@ -1287,7 +1298,7 @@
+@@ -1287,7 +1311,7 @@
  Q3CGOBJ = $(Q3CGOBJ_) $(B)/baseq3/cgame/cg_syscalls.o
  Q3CGVMOBJ = $(Q3CGOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
  
@@ -352,7 +369,7 @@
  	$(echo_cmd) "LD $@"
  	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ)
  
-@@ -1330,7 +1341,7 @@
+@@ -1330,7 +1354,7 @@
  MPCGOBJ = $(MPCGOBJ_) $(B)/missionpack/cgame/cg_syscalls.o
  MPCGVMOBJ = $(MPCGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm
  
@@ -361,7 +378,7 @@
  	$(echo_cmd) "LD $@"
  	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ)
  
-@@ -1382,7 +1393,7 @@
+@@ -1382,7 +1406,7 @@
  Q3GOBJ = $(Q3GOBJ_) $(B)/baseq3/game/g_syscalls.o
  Q3GVMOBJ = $(Q3GOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
  
@@ -370,7 +387,7 @@
  	$(echo_cmd) "LD $@"
  	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ)
  
-@@ -1432,7 +1443,7 @@
+@@ -1432,7 +1456,7 @@
  MPGOBJ = $(MPGOBJ_) $(B)/missionpack/game/g_syscalls.o
  MPGVMOBJ = $(MPGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm
  
@@ -379,7 +396,7 @@
  	$(echo_cmd) "LD $@"
  	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ)
  
-@@ -1494,7 +1505,7 @@
+@@ -1494,7 +1518,7 @@
  Q3UIOBJ = $(Q3UIOBJ_) $(B)/missionpack/ui/ui_syscalls.o
  Q3UIVMOBJ = $(Q3UIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
  
@@ -388,7 +405,7 @@
  	$(echo_cmd) "LD $@"
  	$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)
  
-@@ -1521,7 +1532,7 @@
+@@ -1521,7 +1545,7 @@
  MPUIOBJ = $(MPUIOBJ_) $(B)/missionpack/ui/ui_syscalls.o
  MPUIVMOBJ = $(MPUIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm