diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc28185..9765632 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 - OpenACC flags to build for Volta.
+- Kokkos list CLI argument shows some information about which device will be used.
 
 ### Changed
 - Update SYCL implementation to SYCL 1.2.1 interface.
diff --git a/KokkosStream.cpp b/KokkosStream.cpp
index 7f6813e..7054fba 100644
--- a/KokkosStream.cpp
+++ b/KokkosStream.cpp
@@ -138,13 +138,13 @@ T KokkosStream<T>::dot()
 
 void listDevices(void)
 {
-  std::cout << "This is not the device you are looking for.";
+  std::cout << "Kokkos library for " << getDeviceName(0) << std::endl;
 }
 
 
 std::string getDeviceName(const int device)
 {
-  return "Kokkos";
+  return typeid (Kokkos::DefaultExecutionSpace).name();
 }