--- /root/3.3/wanpipe/Setup	2008-08-01 18:59:35.000000000 -0400
+++ Setup	2008-08-12 14:29:14.000000000 -0400
@@ -3431,6 +3431,7 @@
 	i386*)   LD_ELF="-m elf_i386" 
 		 ;;
 	x86*)   LD_ELF="-m elf_i386" 
+		 ARCH=i386
 		 ;;
 	ppc*)
 		 ;;
@@ -3712,7 +3713,14 @@
 
 	rm -f sdladrv_src.c
 	ln -s sdladrv.c sdladrv_src.c
-	build_kernel_module sdladrv "sdladrv_src sdladrv_fe sdladrv_utils"
+
+	SDLADRV_OBJS="sdladrv_src sdladrv_fe sdladrv_utils "
+
+	if [ "$AFT_USB_PROT" = "YES" ]; then
+		SDLADRV_OBJS=$SDLADRV_OBJS"sdladrv_usb "
+	fi
+
+	build_kernel_module sdladrv "$SDLADRV_OBJS"
 
 	build_kernel_module wanrouter "wanmain wanproc waniface"  
 
@@ -3921,6 +3929,10 @@
 		WANPIPE_OBJS=$WANPIPE_OBJS"sdla_bri aft_bri "
 	fi
 
+	if [ "$AFT_USB_PROT" = "YES" ]; then
+		WANPIPE_OBJS=$WANPIPE_OBJS"wanpipe_usb sdla_usb_remora sdla_usb_remora_tdmv "
+	fi
+
 	if [ "$AFT_SERIAL_PROT" = "YES" ]; then
 		WANPIPE_OBJS=$WANPIPE_OBJS"sdla_serial "
 	fi
@@ -6360,10 +6372,13 @@
 		if [ $AFT_TE1_PROT != YES ]; then
 			echo "Enabling the AFT TE1 Support"
 			PROTOCOL_DEFINES="$PROTOCOL_DEFINES -DCONFIG_PRODUCT_WANPIPE_AFT -DCONFIG_PRODUCT_WANPIPE_AFT_CORE -DCONFIG_PRODUCT_WANPIPE_AFT_TE1 -DCONFIG_PRODUCT_WANPIPE_AFT_56K -DCONFIG_PRODUCT_WANPIPE_AFT_RM -DCONFIG_PRODUCT_WANPIPE_CODEC_SLINEAR_LAW  -DCONFIG_PRODUCT_WANPIPE_AFT_BRI  -DCONFIG_PRODUCT_WANPIPE_AFT_SERIAL "
+
+			PROTOCOL_DEFINES="$PROTOCOL_DEFINES -DCONFIG_PRODUCT_WANPIPE_USB "
 		fi
 		AFT_TE1_PROT=YES
 		AFT_BRI_PROT=YES
 		AFT_SERIAL_PROT=YES
+		AFT_USB_PROT=YES
 		PROT_MATCH=YES
 	fi
 
@@ -6676,6 +6691,7 @@
 X25_PROT=NO
 AFT_TE1_PROT=NO
 AFT_BRI_PROT=NO
+AFT_USB_PROT=NO
 AFT_SERIAL_PROT=NO
 AFT_TE3_PROT=NO
 SSMG=NO
@@ -6924,7 +6940,7 @@
 PKG_NAME=wanpipe
 DISTR_NAME="WANPIPE"
 PROD=wanrouter
-PROD_VER=3.3.12
+PROD_VER=3.5.0.5
 PROD_HOME=`pwd`
 META_CONF=$PROD_HOME/$PROD.rc
 WAN_INTR_DIR=$PROD_HOME/interfaces
