diff --git a/host/libhackrf/examples/CMakeLists.txt b/host/libhackrf/examples/CMakeLists.txt
index a0d395ed..8e465482 100644
--- a/host/libhackrf/examples/CMakeLists.txt
+++ b/host/libhackrf/examples/CMakeLists.txt
@@ -29,12 +29,14 @@ IF( EXAMPLES )
    add_executable(hackrf_transfer hackrf_transfer.c)
    add_executable(hackrf_rffc5071 hackrf_rffc5071.c)
    add_executable(hackrf_spiflash hackrf_spiflash.c)
+   add_executable(hackrf_cpldjtag hackrf_cpldjtag.c)
    
    target_link_libraries(hackrf_max2837 hackrf)
    target_link_libraries(hackrf_si5351c hackrf)
    target_link_libraries(hackrf_transfer hackrf)
    target_link_libraries(hackrf_rffc5071 hackrf)
    target_link_libraries(hackrf_spiflash hackrf)
+   target_link_libraries(hackrf_cpldjtag hackrf)
    
    include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src)
 endif(EXAMPLES)
diff --git a/host/libhackrf/examples/hackrf_cpldjtag.c b/host/libhackrf/examples/hackrf_cpldjtag.c
new file mode 100644
index 00000000..d81c62fb
--- /dev/null
+++ b/host/libhackrf/examples/hackrf_cpldjtag.c
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2012 Jared Boone <jared@sharebrained.com>
+ * Copyright 2013 Benjamin Vernoux <titanmkd@gmail.com>
+ * Copyright 2013 Michael Ossmann <mike@ossmann.com>
+ *
+ * This file is part of HackRF.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <hackrf.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <getopt.h>
+#include <sys/types.h>
+
+/* input file shouldn't be any longer than this */
+#define MAX_XSVF_LENGTH 0x10000
+
+static struct option long_options[] = {
+	{ "length", required_argument, 0, 'l' },
+	{ "xsvf", required_argument, 0, 'x' },
+	{ 0, 0, 0, 0 },
+};
+
+int parse_int(char* s, uint32_t* const value)
+{
+	uint_fast8_t base = 10;
+	if (strlen(s) > 2) {
+		if (s[0] == '0')  {
+			if ((s[1] == 'x') || (s[1] == 'X')) {
+				base = 16;
+				s += 2;
+			} else if ((s[1] == 'b') || (s[1] == 'B')) {
+				base = 2;
+				s += 2;
+			}
+		}
+	}
+
+	char* s_end = s;
+	const long long_value = strtol(s, &s_end, base);
+	if ((s != s_end) && (*s_end == 0)) {
+		*value = long_value;
+		return HACKRF_SUCCESS;
+	} else {
+		return HACKRF_ERROR_INVALID_PARAM;
+	}
+}
+
+static void usage()
+{
+	printf("Usage:\n");
+	//FIXME length should be automatic
+	printf("\t-l, --length <n>: length of XSVF file (default: 0)\n");
+	printf("\t-x <filename>: XSVF file to be written to CPLD.\n");
+}
+
+int main(int argc, char** argv)
+{
+	int opt;
+	uint32_t length = 0;
+	const char* path = NULL;
+	hackrf_device* device = NULL;
+	int result = HACKRF_SUCCESS;
+	int option_index = 0;
+	uint8_t data[MAX_XSVF_LENGTH];
+	FILE* fd = NULL;
+
+	while ((opt = getopt_long(argc, argv, "l:x:", long_options,
+			&option_index)) != EOF) {
+		switch (opt) {
+		case 'l':
+			result = parse_int(optarg, &length);
+			break;
+
+		case 'x':
+			path = optarg;
+			break;
+
+		default:
+			usage();
+			return EXIT_FAILURE;
+		}
+
+		if (result != HACKRF_SUCCESS) {
+			fprintf(stderr, "argument error: %s (%d)\n",
+					hackrf_error_name(result), result);
+			usage();
+			return EXIT_FAILURE;
+		}
+	}
+
+	if (path == NULL) {
+		fprintf(stderr, "Specify a path to a file.\n");
+		usage();
+		return EXIT_FAILURE;
+	}
+
+	if (length > MAX_XSVF_LENGTH) {
+		fprintf(stderr, "XSVF file too large.\n");
+		usage();
+		return EXIT_FAILURE;
+	}
+
+	fd = fopen(path, "rb");
+	if (fd == NULL) {
+		fprintf(stderr, "Failed to open file: %s\n", path);
+		return EXIT_FAILURE;
+	}
+
+	const ssize_t bytes_read = fread(data, 1, length, fd);
+	if (bytes_read != length) {
+		fprintf(stderr, "Failed read file (read %d bytes).\n",
+				(int)bytes_read);
+		fclose(fd);
+		fd = NULL;
+		return EXIT_FAILURE;
+	}
+
+	result = hackrf_init();
+	if (result != HACKRF_SUCCESS) {
+		fprintf(stderr, "hackrf_init() failed: %s (%d)\n",
+				hackrf_error_name(result), result);
+		return EXIT_FAILURE;
+	}
+
+	result = hackrf_open(&device);
+	if (result != HACKRF_SUCCESS) {
+		fprintf(stderr, "hackrf_open() failed: %s (%d)\n",
+				hackrf_error_name(result), result);
+		return EXIT_FAILURE;
+	}
+
+	result = hackrf_cpld_write(device, length, data);
+	if (result != HACKRF_SUCCESS) {
+		fprintf(stderr, "hackrf_cpld_write() failed: %s (%d)\n",
+				hackrf_error_name(result), result);
+		fclose(fd);
+		fd = NULL;
+		return EXIT_FAILURE;
+	}
+
+	result = hackrf_close(device);
+	if (result != HACKRF_SUCCESS) {
+		fprintf(stderr, "hackrf_close() failed: %s (%d)\n",
+				hackrf_error_name(result), result);
+		fclose(fd);
+		fd = NULL;
+		return EXIT_FAILURE;
+	}
+
+	hackrf_exit();
+
+	if (fd != NULL) {
+		fclose(fd);
+	}
+
+	return EXIT_SUCCESS;
+}