diff --git a/ChangeLog b/ChangeLog
index 93f342b37..0fc3d676c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-14  Moritz Bunkus  <moritz@bunkus.org>
+
+        * mkvinfo: bug fix: at most the lower 32bits of the track numbers
+        and track UIDs elements were output, even if the element in the
+        file used more bits. Fixes #935.
+
 2013-11-02  Moritz Bunkus  <moritz@bunkus.org>
 
         * mkvmerge: bug fix: fixed accessing invalid memory in the memory
diff --git a/src/info/mkvinfo.cpp b/src/info/mkvinfo.cpp
index 1c6060b70..ebd62267e 100644
--- a/src/info/mkvinfo.cpp
+++ b/src/info/mkvinfo.cpp
@@ -89,7 +89,7 @@
 using namespace libmatroska;
 
 struct kax_track_t {
-  unsigned int tnum, tuid;
+  uint64_t tnum, tuid;
   char type;
   int64_t default_duration;
   size_t mkvmerge_track_id;
diff --git a/tests/results.txt b/tests/results.txt
index 863db0116..df050dc05 100644
--- a/tests/results.txt
+++ b/tests/results.txt
@@ -110,7 +110,7 @@ T_261line_endings_in_text_files:215e11f96ec8964868f5c41b57465e64-215e11f96ec8964
 T_262level1_with_size_0:cc46aca900577c7f65644dec4fd9e6cf:passed:20100407-131350:0.043549684
 T_263ass_missing_text_in_format:2640dcc0b1ae1e80baf05e17abfab5ca-273e8eb33584686874e52a94a0304cf7:passed:20100411-181436:0.133828607
 T_264avc_es_from_lavf_with_native_codecid:f941ad4b368e24e7d755c8e9f48a4a1f:passed:20100427-123025:0.163914551
-T_265mkvinfo_clusters_with_unknown_size:87344a08cb3ab000b11067b55dcebfec:passed:20100522-213708:0.127393107
+T_265mkvinfo_clusters_with_unknown_size:4aba10f6ff5db401567da01dd6343b0b:passed:20100522-213708:0.127393107
 T_266mkvmerge_clusters_with_unknown_size:f3b0064a62045bb1d7babce0a52b66ee:passed:20100523-154308:0.04514363
 T_267mkvextract_clusters_with_unknown_size:b994ef83db70b5193696121cf1399adf:passed:20100523-154920:0.056976575
 T_268X_vp8:c53158209dbc17baa518129377d74edd:passed:20100527-140446:0.041033789