diff --git a/Makefile.in b/Makefile.in
index bd4b23d..7810f54 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,7 +7,7 @@ GIT_COMMITS=@GIT_COMMITS@
 
 CC?=gcc
 DEBUG?=-g3
-OPTIMIZATION?=-O3
+OPTIMIZATION?=-O3 -march=native
 WARN?=-Wall
 
 #Ultrasparc64 users experiencing SIGBUS should try the following gcc options
diff --git a/speck.h b/speck.h
index c44c6b4..f0402f2 100644
--- a/speck.h
+++ b/speck.h
@@ -9,7 +9,9 @@ typedef struct {
         u64 key[34];
 } speck_context_t;
 #else
- typedef u64 speck_context_t [34];
+typedef struct {
+        u64 key[34];
+} speck_context_t;
 #endif
 
 int speck_ctr (unsigned char *out, const unsigned char *in,
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 3679f7a..ff7fe6d 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,6 +1,6 @@
 CC?=gcc
 DEBUG?=-g3
-#OPTIMIZATION?=-O2
+OPTIMIZATION?=-O2 -march=native
 WARN?=-Wall
 
 INSTALL=install