diff --git a/BasiliskII/src/Unix/Linux/NetDriver/sheep_net.c b/BasiliskII/src/Unix/Linux/NetDriver/sheep_net.c
index fecde9f9..80a585e1 100644
--- a/BasiliskII/src/Unix/Linux/NetDriver/sheep_net.c
+++ b/BasiliskII/src/Unix/Linux/NetDriver/sheep_net.c
@@ -22,9 +22,19 @@
 #include <linux/module.h>
 #include <linux/version.h>
 
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
+#define LINUX_26_35
+#endif
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+#define LINUX_26_36
+#endif
+
 /* Compatibility glue */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
 #define LINUX_26_30
+
 #else
 
 /* determine whether to use checksummed versions of kernel symbols */
@@ -116,7 +126,11 @@ static int sheep_net_release(struct inode *inode, struct file *f);
 static ssize_t sheep_net_read(struct file *f, char *buf, size_t count, loff_t *off);
 static ssize_t sheep_net_write(struct file *f, const char *buf, size_t count, loff_t *off);
 static unsigned int sheep_net_poll(struct file *f, struct poll_table_struct *wait);
+#ifdef LINUX_26_36
+static long sheep_net_ioctl(struct file *f, unsigned int code, unsigned long arg);
+#else
 static int sheep_net_ioctl(struct inode *inode, struct file *f, unsigned int code, unsigned long arg);
+#endif
 #ifdef LINUX_26
 static int sheep_net_receiver(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *foo);
 #else
@@ -152,7 +166,11 @@ static struct file_operations sheep_net_fops = {
 	.read		= sheep_net_read,
 	.write		= sheep_net_write,
 	.poll		= sheep_net_poll,
+#ifdef LINUX_26_36
+	.unlocked_ioctl = sheep_net_ioctl,
+#else
 	.ioctl		= sheep_net_ioctl,
+#endif
 	.open		= sheep_net_open,
 	.release	= sheep_net_release,
 };
@@ -500,7 +518,11 @@ static unsigned int sheep_net_poll(struct file *f, struct poll_table_struct *wai
  *  Driver ioctl() function
  */
 
+#ifdef LINUX_26_36
+static long sheep_net_ioctl(struct file *f, unsigned int code, unsigned long arg)
+#else
 static int sheep_net_ioctl(struct inode *inode, struct file *f, unsigned int code, unsigned long arg)
+#endif
 {
 	struct SheepVars *v = (struct SheepVars *)f->private_data;
 	D(bug("sheep_net: ioctl %04x\n", code));
@@ -600,7 +622,11 @@ error:
 				return -ENODEV;
 			if (copy_from_user(addr, (void *)arg, 6))
 				return -EFAULT;
+			#ifdef LINUX_26_35
+			return dev_mc_add(v->ether, addr);
+			#else
 			return dev_mc_add(v->ether, addr, 6, 0);
+			#endif
 		}
 
 		/* Remove multicast address
@@ -611,7 +637,11 @@ error:
 				return -ENODEV;
 			if (copy_from_user(addr, (void *)arg, 6))
 				return -EFAULT;
+			#ifdef LINUX_26_35
+			return dev_mc_del(v->ether, addr);
+			#else
 			return dev_mc_delete(v->ether, addr, 6, 0);
+			#endif
 		}
 
 		/* Return size of first packet in queue */