diff --git a/tools/Makefile b/tools/Makefile
index 2091692..c08cfde 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,8 +1,8 @@
 #
 # tools/Makefile - Build the ATRF-specific tools
 #
-# Written 2010 by Werner Almesberger
-# Copyright 2010 Werner Almesberger
+# Written 2010-2011 by Werner Almesberger
+# Copyright 2010-2011 Werner Almesberger
 #
 # 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
@@ -14,9 +14,16 @@
 DIRS=atrf-id atrf-reset atrf-rssi atrf-trim atrf-txrx
 TARGET_ONLY_DIRS=lib
 
+ifeq ($(TARGET),ben_jlime)
+HOST = jlime
+else
+HOST = ben
+endif
+
+
 include ../Makefile.recurse
 
 .PHONY:		upload
 
 upload:		
-		scp `for n in $(DIRS); do echo $$n/$$n; done` ben:
+		scp `for n in $(DIRS); do echo $$n/$$n; done` $(HOST):
diff --git a/tools/Makefile.common b/tools/Makefile.common
index 0bbc7bd..71d9a4c 100644
--- a/tools/Makefile.common
+++ b/tools/Makefile.common
@@ -1,8 +1,8 @@
 #
 # tools/Makefile.common - Common items in ATRF tool makefiles
 #
-# Written 2010 by Werner Almesberger
-# Copyright 2010 Werner Almesberger
+# Written 2010-2011 by Werner Almesberger
+# Copyright 2010-2011 Werner Almesberger
 #
 # 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
@@ -21,13 +21,20 @@ include $(F32XBASE)/lib/Makefile.common
 endif
 
 CC_host = gcc
-CC_ben = mipsel-openwrt-linux-gcc
+CC_ben_jlime = mipsel-linux-gcc
+CC_ben_openwrt = mipsel-openwrt-linux-gcc
+
 CFLAGS_host =
-CFLAGS_ben =
+CFLAGS_ben_jlime =
+CFLAGS_ben_openwrt =
+
 LDLIBS_host = -lusb
-LDLIBS_ben =
+LDLIBS_ben_jlime =
+LDLIBS_ben_openwrt =
+
 MACROS_host = -DHAVE_USB
-MACROS_ben = -DHAVE_USD
+MACROS_ben_jlime = -DHAVE_USD
+MACROS_ben_openwrt = -DHAVE_USD
 
 CC_normal	:= $(CC_$(TARGET))
 AR_normal	:= $(AR)
diff --git a/tools/atrf-rssi/Makefile b/tools/atrf-rssi/Makefile
index a1ef26d..b7d19c2 100644
--- a/tools/atrf-rssi/Makefile
+++ b/tools/atrf-rssi/Makefile
@@ -1,8 +1,8 @@
 #
 # atrf-rssi/Makefile - Build the spectrum scan utility
 #
-# Written 2010 by Werner Almesberger
-# Copyright 2010 Werner Almesberger
+# Written 2010-2011 by Werner Almesberger
+# Copyright 2010-2011 Werner Almesberger
 #
 # 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
@@ -20,4 +20,9 @@ MACROS_host += -DHAVE_GFX
 LDLIBS_host += $(shell sdl-config --libs) -lSDL_gfx
 OBJS_host = gui.o zgrid.o digit.o
 
+CFLAGS_ben_jlime += $(shell sdl-config --cflags)
+MACROS_ben_jlime += -DHAVE_GFX
+LDLIBS_ben_jlime += -lSDL -lSDL_gfx
+OBJS_ben_jlime = gui.o zgrid.o digit.o
+
 $(MAIN):	$(OBJS_$(TARGET))
diff --git a/tools/lib/Makefile b/tools/lib/Makefile
index 693b55d..06b4cff 100644
--- a/tools/lib/Makefile
+++ b/tools/lib/Makefile
@@ -1,8 +1,8 @@
 #
 # lib/Makefile - Build the ATRF library
 #
-# Written 2010 by Werner Almesberger
-# Copyright 2010 Werner Almesberger
+# Written 2010-2011 by Werner Almesberger
+# Copyright 2010-2011 Werner Almesberger
 #
 # 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
@@ -16,8 +16,11 @@ LIB = libatrf.a
 include ../Makefile.common
 
 CFLAGS += -Wall -I$(F32XBASE)/include
+
 OBJS_host = atusb.o $(F32XBASE)/lib/usb.o
-OBJS_ben = atusd.o
+OBJS_ben_jlime = atusd.o
+OBJS_ben_openwrt = atusd.o
+
 OBJS = atrf.o misctxrx.o $(OBJS_$(TARGET))
 
 .PHONY:		all clean spotless