diff -ur libusb-0.2.0J/freebsd.c libusb-0.2.0J2/freebsd.c
--- libusb-0.2.0J/freebsd.c	Thu Aug 30 12:19:45 2001
+++ libusb-0.2.0J2/freebsd.c	Sun Jun 23 01:20:07 2002
@@ -169,8 +169,8 @@
   if (dev->interface < 0)
     USB_ERROR(-EINVAL);
 
-  intf.interface_index = dev->interface;
-  intf.alt_no = alternate;
+  intf.uai_interface_index = dev->interface;
+  intf.uai_alt_no = alternate;
 
   ret = ioctl(dev->fd, USB_SET_ALTINTERFACE, &intf);
   if (ret < 0)
@@ -443,14 +443,14 @@
     fprintf(stderr, "usb_control_msg: %d %d %d %d %p %d %d\n",
             requesttype, request, value, index, bytes, size, timeout);
 
-  req.request.bmRequestType = requesttype;
-  req.request.bRequest = request;
-  USETW(req.request.wValue, value);
-  USETW(req.request.wIndex, index);
-  USETW(req.request.wLength, size);
+  req.ucr_request.bmRequestType = requesttype;
+  req.ucr_request.bRequest = request;
+  USETW(req.ucr_request.wValue, value);
+  USETW(req.ucr_request.wIndex, index);
+  USETW(req.ucr_request.wLength, size);
 
-  req.data = bytes;
-  req.flags = 0;
+  req.ucr_data = bytes;
+  req.ucr_flags = 0;
 
 #if 0				/* -wsr */
   ret = ioctl(dev->fd, USB_SET_TIMEOUT, &timeout);
@@ -487,23 +487,23 @@
     struct usb_device *dev;
     char buf[20];
 
-    di.addr = device;
+    di.udi_addr = device;
     if(ioctl(cfd, USB_DEVICEINFO, &di) < 0)
       continue;
 
     /* There's a device; is it one we should mess with? */
 
-    if (strncmp(di.devnames[0], "ugen", 4) != 0)
+    if (strncmp(di.udi_devnames[0], "ugen", 4) != 0)
       /* best not to play with things we don't understand */
       continue;
 
     /* Open its control endpoint */
-    sprintf(buf, "/dev/%s", di.devnames[0]);
+    sprintf(buf, "/dev/%s", di.udi_devnames[0]);
     dfd = open(buf, O_RDONLY);
     if (dfd < 0) {
       if (usb_debug >= 2)
         fprintf(stderr, "usb_find_devices_on_bus: couldn't open device /dev/%s: %s\n",
-                di.devnames[0], strerror(errno));
+                di.udi_devnames[0], strerror(errno));
       continue;
     }