diff --git a/keyboards/handwired/amigopunk/amigopunk.c b/keyboards/handwired/amigopunk/amigopunk.c
new file mode 100644
index 00000000000..dbb70415ac7
--- /dev/null
+++ b/keyboards/handwired/amigopunk/amigopunk.c
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2021 Christiano Haesbaert <haesbaert@haesbaert.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "amigopunk.h"
diff --git a/keyboards/handwired/amigopunk/amigopunk.h b/keyboards/handwired/amigopunk/amigopunk.h
new file mode 100644
index 00000000000..273cd09e3fe
--- /dev/null
+++ b/keyboards/handwired/amigopunk/amigopunk.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2021 Christiano Haesbaert <haesbaert@haesbaert.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,      K0G,   \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E,      K1F,        \
+    K20,   K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,    K2F,        \
+    K30,    K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                    \
+    K41,       K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D,          K4F,        \
+         K51,   K53,                  K57,                 K5B,   K5D,    K5E, K5F, K5G    \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   KC_NO, K0G   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   KC_NO, K1E,   K1F,   KC_NO }, \
+    { K20,   KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   KC_NO }, \
+    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO }, \
+    { KC_NO, K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   KC_NO, K4D,   KC_NO, K4F,   KC_NO }, \
+    { KC_NO, K51,   KC_NO, K53,   KC_NO, KC_NO, KC_NO, K57,   KC_NO, KC_NO, KC_NO, K5B,   KC_NO, K5D,   K5E,   K5F,   K5G   }, \
+}
diff --git a/keyboards/handwired/amigopunk/config.h b/keyboards/handwired/amigopunk/config.h
new file mode 100644
index 00000000000..29141234d49
--- /dev/null
+++ b/keyboards/handwired/amigopunk/config.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2021 Christiano Haesbaert <haesbaert@haesbaert.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x1805
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    haesbaert
+#define PRODUCT         amigopunk
+
+/* Key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+/* Key matrix pins */
+#define MATRIX_ROW_PINS { C0, C1, C2, C3, C4, C5 }
+#define MATRIX_COL_PINS { B6, B5, B4, B3, B2, B1, B0, E7, E6, F0, F1, F2, F3, F4, F5, F6, F7 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Encoder setup */
+#ifdef ENCODER_ENABLE
+#define ENCODERS_PAD_A { E0 }
+#define ENCODERS_PAD_B { E1 }
+#endif
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/amigopunk/info.json b/keyboards/handwired/amigopunk/info.json
new file mode 100644
index 00000000000..ac9aec8f560
--- /dev/null
+++ b/keyboards/handwired/amigopunk/info.json
@@ -0,0 +1,93 @@
+{
+    "keyboard_name": "amigopunk",
+    "url": "www.haesbaert.org",
+    "maintainer": "haesbaert",
+    "width": 17,
+    "height": 6,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"K00 (C0,B6)", "x":0, "y":0.25},
+                {"label":"K01 (C0,B5)", "x":1, "y":0.25},
+                {"label":"K02 (C0,B4)", "x":2, "y":0.25},
+                {"label":"K03 (C0,B3)", "x":3, "y":0.25},
+                {"label":"K04 (C0,B2)", "x":4, "y":0.25},
+                {"label":"K05 (C0,B1)", "x":5, "y":0.25},
+                {"label":"K06 (C0,B0)", "x":6, "y":0.25},
+                {"label":"K07 (C0,E7)", "x":7, "y":0.25},
+                {"label":"K08 (C0,E6)", "x":8, "y":0.25},
+                {"label":"K09 (C0,F0)", "x":9, "y":0.25},
+                {"label":"K0A (C0,F1)", "x":10, "y":0.25},
+                {"label":"K0B (C0,F2)", "x":11, "y":0.25},
+                {"label":"K0C (C0,F3)", "x":12, "y":0.25},
+                {"label":"K0D (C0,F4)", "x":13, "y":0.25},
+                {"label":"K0E (C0,F5)", "x":14, "y":0.25},
+                {"label":"K0G (C0,F7)", "x":16, "y":0.25},
+                {"label":"K10 (C1,B6)", "x":0, "y":1.25},
+                {"label":"K11 (C1,B5)", "x":1, "y":1.25},
+                {"label":"K12 (C1,B4)", "x":2, "y":1.25},
+                {"label":"K13 (C1,B3)", "x":3, "y":1.25},
+                {"label":"K14 (C1,B2)", "x":4, "y":1.25},
+                {"label":"K15 (C1,B1)", "x":5, "y":1.25},
+                {"label":"K16 (C1,B0)", "x":6, "y":1.25},
+                {"label":"K17 (C1,E7)", "x":7, "y":1.25},
+                {"label":"K18 (C1,E6)", "x":8, "y":1.25},
+                {"label":"K19 (C1,F0)", "x":9, "y":1.25},
+                {"label":"K1A (C1,F1)", "x":10, "y":1.25},
+                {"label":"K1B (C1,F2)", "x":11, "y":1.25},
+                {"label":"K1C (C1,F3)", "x":12, "y":1.25},
+                {"label":"K1E (C1,F5)", "x":13, "y":1.25, "w":2},
+                {"label":"K1F (C1,F6)", "x":15, "y":1.25},
+                {"label":"K20 (C2,B6)", "x":0, "y":2.25, "w":1.5},
+                {"label":"K22 (C2,B4)", "x":1.5, "y":2.25},
+                {"label":"K23 (C2,B3)", "x":2.5, "y":2.25},
+                {"label":"K24 (C2,B2)", "x":3.5, "y":2.25},
+                {"label":"K25 (C2,B1)", "x":4.5, "y":2.25},
+                {"label":"K26 (C2,B0)", "x":5.5, "y":2.25},
+                {"label":"K27 (C2,E7)", "x":6.5, "y":2.25},
+                {"label":"K28 (C2,E6)", "x":7.5, "y":2.25},
+                {"label":"K29 (C2,F0)", "x":8.5, "y":2.25},
+                {"label":"K2A (C2,F1)", "x":9.5, "y":2.25},
+                {"label":"K2B (C2,F2)", "x":10.5, "y":2.25},
+                {"label":"K2C (C2,F3)", "x":11.5, "y":2.25},
+                {"label":"K2D (C2,F4)", "x":12.5, "y":2.25},
+                {"label":"K2E (C2,F5)", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"K2F (C2,F6)", "x":15, "y":2.25},
+                {"label":"K30 (C3,B6)", "x":0, "y":3.25, "w":1.75},
+                {"label":"K32 (C3,B4)", "x":1.75, "y":3.25},
+                {"label":"K33 (C3,B3)", "x":2.75, "y":3.25},
+                {"label":"K34 (C3,B2)", "x":3.75, "y":3.25},
+                {"label":"K35 (C3,B1)", "x":4.75, "y":3.25},
+                {"label":"K36 (C3,B0)", "x":5.75, "y":3.25},
+                {"label":"K37 (C3,E7)", "x":6.75, "y":3.25},
+                {"label":"K38 (C3,E6)", "x":7.75, "y":3.25},
+                {"label":"K39 (C3,F0)", "x":8.75, "y":3.25},
+                {"label":"K3A (C3,F1)", "x":9.75, "y":3.25},
+                {"label":"K3B (C3,F2)", "x":10.75, "y":3.25},
+                {"label":"K3C (C3,F3)", "x":11.75, "y":3.25},
+                {"label":"K3D (C3,F4)", "x":12.75, "y":3.25, "w":2.25},
+                {"label":"K41 (C4,B5)", "x":0, "y":4.25, "w":2.25},
+                {"label":"K42 (C4,B4)", "x":2.25, "y":4.25},
+                {"label":"K43 (C4,B3)", "x":3.25, "y":4.25},
+                {"label":"K44 (C4,B2)", "x":4.25, "y":4.25},
+                {"label":"K45 (C4,B1)", "x":5.25, "y":4.25},
+                {"label":"K46 (C4,B0)", "x":6.25, "y":4.25},
+                {"label":"K47 (C4,E7)", "x":7.25, "y":4.25},
+                {"label":"K48 (C4,E6)", "x":8.25, "y":4.25},
+                {"label":"K49 (C4,F0)", "x":9.25, "y":4.25},
+                {"label":"K4A (C4,F1)", "x":10.25, "y":4.25},
+                {"label":"K4B (C4,F2)", "x":11.25, "y":4.25},
+                {"label":"K4D (C4,F4)", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"K4F (C4,F6)", "x":15, "y":4.25},
+                {"label":"K51 (C5,B5)", "x":1, "y":5.25, "w":1.5},
+                {"label":"K53 (C5,B3)", "x":2.5, "y":5.25, "w":1.5},
+                {"label":"K57 (C5,E7)", "x":4, "y":5.25, "w":7},
+                {"label":"K5B (C5,F2)", "x":11, "y":5.25, "w":1.5},
+                {"label":"K5D (C5,F4)", "x":12.5, "y":5.25, "w":1.5},
+                {"label":"K5E (C5,F5)", "x":14, "y":5.25},
+                {"label":"K5F (C5,F6)", "x":15, "y":5.25},
+                {"label":"K5G (C5,F7)", "x":16, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/amigopunk/keymaps/default/keymap.c b/keyboards/handwired/amigopunk/keymaps/default/keymap.c
new file mode 100644
index 00000000000..7aed2a61cf2
--- /dev/null
+++ b/keyboards/handwired/amigopunk/keymaps/default/keymap.c
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2021 Christiano Haesbaert <haesbaert@haesbaert.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,           KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_PGUP,
+        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,      KC_PGDN,
+        KC_LCTL,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+        KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,                 KC_UP,
+                 KC_LGUI,     KC_LALT,                             KC_SPC,                                 XXXXXXX,     MO(1),        KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______, _______, _______, KC_PSCR, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_HOME,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      KC_END,
+        KC_CAPS,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE,                 KC_VOLU,
+                 _______,     _______,                            _______,                                 _______,     _______,      KC_MPRV, KC_VOLD, KC_MNXT
+    ),
+
+};
+
+#ifdef ENCODER_ENABLE
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index != 0)
+        return;
+
+    tap_code(clockwise ? KC_VOLU : KC_VOLD);
+}
+#endif
+
+#ifdef OLED_DRIVER_ENABLE
+
+static void render_amigopunk_logo(void) {
+    static const char PROGMEM amigopunk_logo[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80,
+        0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0x0f, 0x03, 0xff, 0xfc, 0x80, 0x00, 0x00,
+        0x00, 0xf8, 0xf8, 0x60, 0x30, 0xf8, 0xf0, 0x20, 0x30, 0xf8, 0xf0, 0x00, 0x00, 0x00, 0x38, 0x38,
+        0x38, 0xf9, 0xf9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0x38, 0x18, 0x18, 0xf8,
+        0xf8, 0x98, 0x18, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0xf0, 0x38, 0x38, 0x78, 0xf0, 0xe0, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
+        0x03, 0x03, 0x03, 0x03, 0xff, 0xff, 0x78, 0x00, 0x00, 0x00, 0xf8, 0xf8, 0x00, 0x00, 0x00, 0x00,
+        0xf8, 0xf8, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf8, 0xf0, 0x20, 0x30, 0x78, 0xf8, 0xf0, 0x00, 0x00,
+        0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0xc0, 0xf0, 0xf8, 0x38, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xfe, 0x7f, 0x0f, 0x0e, 0x0e, 0x0e, 0x7f, 0xff, 0xf0, 0x00,
+        0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0xe0, 0xe0,
+        0xe0, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0xbc, 0xfd, 0xe7, 0xe6, 0xe6, 0xe3,
+        0xe3, 0xc1, 0x80, 0x00, 0x00, 0x00, 0x3f, 0x7f, 0x78, 0xe0, 0xe0, 0xf0, 0x7f, 0x3f, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
+        0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xf0, 0x60, 0x20, 0x30,
+        0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+        0x00, 0x00, 0xff, 0xff, 0xff, 0x07, 0x1f, 0x7f, 0xf8, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c,
+        0x0c, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    oled_write_raw_P(amigopunk_logo, sizeof(amigopunk_logo));
+}
+void oled_task_user(void) {
+    render_amigopunk_logo();
+    /* oled_write_P(PSTR("Amigo Punk\n"), false); */
+}
+#endif
diff --git a/keyboards/handwired/amigopunk/readme.md b/keyboards/handwired/amigopunk/readme.md
new file mode 100644
index 00000000000..bad49bd53f1
--- /dev/null
+++ b/keyboards/handwired/amigopunk/readme.md
@@ -0,0 +1,19 @@
+# amigopunk
+
+![amigopunk](https://i.imgur.com/7uVsX1vh.jpeg)
+
+A 75% handwired with rotary encoder and OLED using matias clicky ALPS.
+
+* Keyboard Maintainer: [haesbaert](https://github.com/haesbaert)
+* Hardware Supported: Teensy 2.0++
+* Hardware Availability: haesbaert@haesbaert.org
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/amigopunk:default
+
+Flashing example for this keyboard:
+
+    make handwired/amigopunk:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/handwired/amigopunk/rules.mk b/keyboards/handwired/amigopunk/rules.mk
new file mode 100644
index 00000000000..d62975bc9fa
--- /dev/null
+++ b/keyboards/handwired/amigopunk/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = at90usb1286
+
+# Bootloader selection
+BOOTLOADER = halfkay
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = full     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
+OLED_DRIVER_ENABLE = yes