diff --git a/Makefile.am b/Makefile.am
index cd08321..de31a0b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,20 +40,20 @@ cudaminer_LDADD		= @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @WS2_LIBS@ @CUDA_LIBS
 cudaminer_CPPFLAGS	= -msse2 @LIBCURL_CPPFLAGS@ @OPENMP_CFLAGS@ $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES) -DSCRYPT_KECCAK512 -DSCRYPT_CHACHA -DSCRYPT_CHOOSE_COMPILETIME
 
 .cu.o:
-	$(NVCC) @CFLAGS@ -Xptxas "-abi=no -v" -arch=compute_10 --maxrregcount=64 --ptxas-options=-v $(JANSSON_INCLUDES) -o $@ -c $<
+	$(NVCC) @CFLAGS@ -Xptxas "-abi=no -v" -arch=compute_20 --maxrregcount=64 --ptxas-options=-v $(JANSSON_INCLUDES) -o $@ -c $<
 
 sha256.o: sha256.cu
-	$(NVCC) @CFLAGS@ -Xptxas "-abi=no -v" -arch=compute_10 --maxrregcount=64 --ptxas-options=-v $(JANSSON_INCLUDES) -o $@ -c $<
+	$(NVCC) @CFLAGS@ -Xptxas "-abi=no -v" -arch=compute_20 --maxrregcount=64 --ptxas-options=-v $(JANSSON_INCLUDES) -o $@ -c $<
 
 keccak.o: keccak.cu
-	$(NVCC) @CFLAGS@ -Xptxas "-abi=no -v" -arch=compute_10 --maxrregcount=64 --ptxas-options=-v $(JANSSON_INCLUDES) -o $@ -c $<
+	$(NVCC) @CFLAGS@ -Xptxas "-abi=no -v" -arch=compute_20 --maxrregcount=64 --ptxas-options=-v $(JANSSON_INCLUDES) -o $@ -c $<
 
 blake.o: blake.cu
-	$(NVCC) @CFLAGS@ -Xptxas "-abi=no -v" -arch=compute_10 --maxrregcount=64 --ptxas-options=-v $(JANSSON_INCLUDES) -o $@ -c $<
+	$(NVCC) @CFLAGS@ -Xptxas "-abi=no -v" -arch=compute_20 --maxrregcount=64 --ptxas-options=-v $(JANSSON_INCLUDES) -o $@ -c $<
 
 # NOTE: now compiling for compute 1.0 again, as it's using less power and runs way faster on Linux
 fermi_kernel.o: fermi_kernel.cu
-	$(NVCC) @CFLAGS@ -Xptxas "-abi=no -v" -arch=compute_10 --maxrregcount=64 $(JANSSON_INCLUDES) -o $@ -c $<
+	$(NVCC) @CFLAGS@ -Xptxas "-abi=no -v" -arch=compute_20 --maxrregcount=64 $(JANSSON_INCLUDES) -o $@ -c $<
 
 kepler_kernel.o: kepler_kernel.cu
 	$(NVCC) @CFLAGS@ -Xptxas "-abi=no -v" -arch=sm_30 --maxrregcount=32 $(JANSSON_INCLUDES) -o $@ -c $<
@@ -63,7 +63,7 @@ titan_kernel.o: titan_kernel.cu
 
 # NOTE: now compiling for compute 1.0 again, as it's using less power and runs way faster on Linux
 test_kernel.o: test_kernel.cu
-	$(NVCC) @CFLAGS@ -Xptxas "-abi=no -v" -arch=compute_10 --maxrregcount=32 $(JANSSON_INCLUDES) -o $@ -c $<
+	$(NVCC) @CFLAGS@ -Xptxas "-abi=no -v" -arch=compute_20 --maxrregcount=32 $(JANSSON_INCLUDES) -o $@ -c $<
 
 nv_kernel.o: nv_kernel.cu
 	$(NVCC) @CFLAGS@ -Xptxas "-abi=no -v" -arch=sm_30 --maxrregcount=63 $(JANSSON_INCLUDES) -o $@ -c $<
diff --git a/configure.ac b/configure.ac
index bfda1fb..ca2d68d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,11 +131,14 @@ AC_CONFIG_FILES([
 
 dnl find out what version we are running
 ARCH=`uname -m`
-if [[ $ARCH == "x86_64" ]];
+OS=`uname -s`
+SUFFIX=""
+if [[ $ARCH == "x86_64" && $OS != "Darwin" ]];
 then
   SUFFIX="64"
-else
-  SUFFIX=""
+elif [[ $OS == "Darwin" ]];
+then
+  CXXFLAGS="$CXXFLAGS -lc++"
 fi
 
 dnl Setup CUDA paths
@@ -154,6 +157,16 @@ else
    CUDA_LDFLAGS="-L/usr/local/cuda/lib$SUFFIX"
    NVCC="nvcc"
 fi
+
+dnl Setup OpenSSL path
+AC_ARG_WITH([openssl],
+   [  --with-openssl=PATH     prefix where openssl is isntalled])
+
+if test -n "$with_openssl"
+then
+  CFLAGS="$CFLAGS -I$with_openssl/include"
+fi
+
 AC_SUBST(CUDA_CFLAGS)
 AC_SUBST(CUDA_LIBS)
 AC_SUBST(CUDA_LDFLAGS)
diff --git a/scrypt-jane.cpp b/scrypt-jane.cpp
index 5733ac9..51a3524 100644
--- a/scrypt-jane.cpp
+++ b/scrypt-jane.cpp
@@ -22,7 +22,11 @@
 #define scrypt_maxp 25  /* (1 << 25) = ~33 million */
 
 #include <stdio.h>
+#ifdef __APPLE__
+#include <malloc/malloc.h>
+#else
 #include <malloc.h>
+#endif
 
 // ---------------------------- BEGIN keccak functions ------------------------------------
 
diff --git a/scrypt.cpp b/scrypt.cpp
index da1d51b..08c7aa4 100644
--- a/scrypt.cpp
+++ b/scrypt.cpp
@@ -44,7 +44,11 @@ using namespace Concurrency;
 #include <string.h>
 
 #include <emmintrin.h>
+#ifdef __APPLE__
+#include <malloc/malloc.h>
+#else
 #include <malloc.h>
+#endif
 #include <new>
 
 // A thin wrapper around the builtin __m128i type
diff --git a/sha3.cpp b/sha3.cpp
index 02b40ca..11ae666 100644
--- a/sha3.cpp
+++ b/sha3.cpp
@@ -6,7 +6,11 @@
 
 #include <string.h>
 #include <stdio.h>
+#ifdef __APPLE__
+#include <malloc/malloc.h>
+#else
 #include <malloc.h>
+#endif
 
 #include "sha3.h"
 
diff --git a/wrapnvml.cu b/wrapnvml.cu
index 5da37a7..6199d02 100644
--- a/wrapnvml.cu
+++ b/wrapnvml.cu
@@ -74,6 +74,8 @@ wrap_nvml_handle * wrap_nvml_create() {
 #elif defined(__linux)
   /* 64-bit linux assumed */
 #define  libnvidia_ml "/usr/lib/libnvidia-ml.so"
+#elif defined(__APPLE__)
+#define  libnvidia_ml ""
 #else
 #error "Unrecognized platform: need NVML DLL path for this platform..."
 #endif