diff --git a/UIPEthernet.cpp b/UIPEthernet.cpp
index ea02c97..3f8cb50 100644
--- a/UIPEthernet.cpp
+++ b/UIPEthernet.cpp
@@ -310,6 +310,11 @@ void UIPEthernetClass::configure(IPAddress ip, IPAddress dns, IPAddress gateway,
   _dnsServerAddress = dns;
 }
 
+void UIPEthernetClass::setSSPIN(uint8_t cs, uint8_t ss) {
+  Enc28J60Network::CONTROL_CS = cs;
+  Enc28J60Network::SPI_SS = ss;
+}
+
 UIPEthernetClass UIPEthernet;
 
 /*---------------------------------------------------------------------------*/
diff --git a/UIPEthernet.h b/UIPEthernet.h
index 3bb18d4..083b40b 100644
--- a/UIPEthernet.h
+++ b/UIPEthernet.h
@@ -76,6 +76,8 @@ class UIPEthernetClass
   // events have been processed. Renews dhcp-lease if required.
   int maintain();
 
+  static void setSSPIN(uint8_t cs, uint8_t ss);
+
   IPAddress localIP();
   IPAddress subnetMask();
   IPAddress gatewayIP();
@@ -95,6 +97,7 @@ class UIPEthernetClass
   static void init(const uint8_t* mac);
   static void configure(IPAddress ip, IPAddress dns, IPAddress gateway, IPAddress subnet);
 
+
   static void tick();
 
   static boolean network_send();
diff --git a/utility/Enc28J60Network.cpp b/utility/Enc28J60Network.cpp
index fbef88d..e639c1b 100644
--- a/utility/Enc28J60Network.cpp
+++ b/utility/Enc28J60Network.cpp
@@ -36,15 +36,24 @@ extern "C" {
 #endif
 
 // set CS to 0 = active
-#define CSACTIVE digitalWrite(ENC28J60_CONTROL_CS, LOW)
+#define CSACTIVE digitalWrite(CONTROL_CS, LOW)
 // set CS to 1 = passive
-#define CSPASSIVE digitalWrite(ENC28J60_CONTROL_CS, HIGH)
+#define CSPASSIVE digitalWrite(CONTROL_CS, HIGH)
 //
 #define waitspi() while(!(SPSR&(1<<SPIF)))
 
 uint16_t Enc28J60Network::nextPacketPtr;
 uint8_t Enc28J60Network::bank=0xff;
 
+#if defined(__AVR_ATmega32U4__) // LEONARDO
+uint8_t Enc28J60Network::CONTROL_CS = 10;
+uint8_t Enc28J60Network::SPI_SS = 10;
+#else
+uint8_t Enc28J60Network::CONTROL_CS = SS;
+uint8_t Enc28J60Network::SPI_SS = SS;
+#endif
+
+
 struct memblock Enc28J60Network::receivePkt;
 
 void Enc28J60Network::init(uint8_t* macaddr)
@@ -52,7 +61,7 @@ void Enc28J60Network::init(uint8_t* macaddr)
   MemoryPool::init(); // 1 byte in between RX_STOP_INIT and pool to allow prepending of controlbyte
   // initialize I/O
   // ss as output:
-  pinMode(ENC28J60_CONTROL_CS, OUTPUT);
+  pinMode(CONTROL_CS, OUTPUT);
   CSPASSIVE; // ss=0
   //
   pinMode(SPI_MOSI, OUTPUT);
diff --git a/utility/Enc28J60Network.h b/utility/Enc28J60Network.h
index 7346e47..4d98e3b 100644
--- a/utility/Enc28J60Network.h
+++ b/utility/Enc28J60Network.h
@@ -27,14 +27,17 @@
 
 #include "mempool.h"
 
-#define ENC28J60_CONTROL_CS     SS
+//#define ENC28J60_CONTROL_CS     10
 #define SPI_MOSI        MOSI
 #define SPI_MISO        MISO
 #define SPI_SCK         SCK
-#define SPI_SS          SS
+//#define SPI_SS          10
 
 #define UIP_RECEIVEBUFFERHANDLE 0xff
 
+
+
+
 //#define ENC28J60DEBUG
 
 /*
@@ -70,6 +73,9 @@ class Enc28J60Network : public MemoryPool
   friend void enc28J60_mempool_block_move_callback(memaddress,memaddress,memaddress);
 
 public:
+  
+  static uint8_t CONTROL_CS;
+  static uint8_t SPI_SS;
 
   uint8_t getrev(void);
   void powerOn();