diff --git a/CHANGELOG b/CHANGELOG
index 10ed5e9..5d502f9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,7 @@
 
+Version 1.7.1
+- Added additional device properties to JSON-output
+
 Version 1.7.0
 - Now using the Claduc C++11 interface to OpenCL
 - Added a method to print all tuning results in JSON-format to file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 990180d..fb0ef5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ cmake_minimum_required(VERSION 2.8.10)
 project("cltune" CXX)
 set(cltune_VERSION_MAJOR 1)
 set(cltune_VERSION_MINOR 7)
-set(cltune_VERSION_PATCH 0)
+set(cltune_VERSION_PATCH 1)
 
 # Options
 option(SAMPLES "Enable compilation of sample programs" ON)
diff --git a/src/cltune.cc b/src/cltune.cc
index 81c1461..cca33d1 100644
--- a/src/cltune.cc
+++ b/src/cltune.cc
@@ -337,9 +337,11 @@ void Tuner::PrintJSON(const std::string &filename,
   for (auto &description: descriptions) {
     fprintf(file, "  \"%s\": \"%s\",\n", description.first.c_str(), description.second.c_str());
   }
-  fprintf(file, "  \"vendor\": \"%s\",\n", pimpl->device().Vendor().c_str());
-  fprintf(file, "  \"type\": \"%s\",\n", device_type.c_str());
   fprintf(file, "  \"device\": \"%s\",\n", pimpl->device().Name().c_str());
+  fprintf(file, "  \"device_vendor\": \"%s\",\n", pimpl->device().Vendor().c_str());
+  fprintf(file, "  \"device_type\": \"%s\",\n", device_type.c_str());
+  fprintf(file, "  \"device_core_clock\": \"%lu\",\n", pimpl->device().CoreClock());
+  fprintf(file, "  \"device_compute_units\": \"%lu\",\n", pimpl->device().ComputeUnits());
   fprintf(file, "  \"results\": [\n");
 
   // Loops over all the results