diff --git a/lib/geocoder/cli.rb b/lib/geocoder/cli.rb
index 88e12e58c743184395df326d79499778a92281a1..0a866b72db550f2fc0c7b352d78c4663374c16e0 100644
--- a/lib/geocoder/cli.rb
+++ b/lib/geocoder/cli.rb
@@ -75,8 +75,18 @@ module Geocoder
       end
 
       if (result = Geocoder.search(query).first)
-        out << result.coordinates.join(',') + "\n"
-        out << result.address + "\n"
+        lines = [
+          ["Latitude",       :latitude],
+          ["Longitude",      :longitude],
+          ["Full address",   :address],
+          ["City",           :city],
+          ["State/province", :state],
+          ["Postal code",    :postal_code],
+          ["Country",        :country],
+        ]
+        lines.each do |line|
+          out << (line[0] + ": ").ljust(18) + result.send(line[1]).to_s + "\n"
+        end
         exit 0
       else
         out << "Location '#{query}' not found.\n"