diff --git a/programming/language/tcl/tcltk/pspec.xml b/programming/language/tcl/tcltk/pspec.xml
index 6dbce152bc..f91d92f5a6 100644
--- a/programming/language/tcl/tcltk/pspec.xml
+++ b/programming/language/tcl/tcltk/pspec.xml
@@ -12,7 +12,7 @@
         <IsA>library</IsA>
         <Summary>An X11 toolkit implemented with the Tcl scripting language</Summary>
         <Description>Tk is an X Windows widget set designed to work closely with the tcl scripting language. It allows you to write simple programs with full featured GUIs in only a little more time then it takes to write a text based interface.</Description>
-        <Archive sha1sum="244ddc0f64cc3d429c9d86135d0bbe2cf06c9360" type="targz">mirrors://sourceforge/tcl/tk8.6.6-src.tar.gz</Archive>
+        <Archive sha1sum="34d546496c05014349cf5edad6696c125ad4f9ea" type="targz">mirrors://sourceforge/tcl/tk8.6.6-src.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>tcl-devel</Dependency>
             <Dependency>libX11-devel</Dependency>
diff --git a/programming/misc/icu4c/files/icu4c-58.2-fix_enumeration-1-1.patch b/programming/misc/icu4c/files/icu4c-58.2-fix_enumeration-1-1.patch
new file mode 100644
index 0000000000..b932160c82
--- /dev/null
+++ b/programming/misc/icu4c/files/icu4c-58.2-fix_enumeration-1-1.patch
@@ -0,0 +1,79 @@
+Submitted By: Pierre Labastie <pierre dot labastie at neuf dot fr>
+Date: 2016-11-15
+Initial Package Version: 58.1
+Upstream Status: Applied
+Origin: Upstream, rediffed so that patch -p1 works.
+Description: Fix a regression in 58.1, which made mozilla applications
+segfault. See ticket #8527
+
+diff -Naur icu.old/source/common/ulist.c icu.new/source/common/ulist.c
+--- icu.old/source/common/ulist.c	2016-06-15 20:58:17.000000000 +0200
++++ /icu/source/common/ulist.c	2016-11-15 16:11:09.996596933 +0100
+@@ -29,7 +29,6 @@
+     UListNode *tail;
+     
+     int32_t size;
+-    int32_t currentIndex;
+ };
+ 
+ static void ulist_addFirstItem(UList *list, UListNode *newItem);
+@@ -51,7 +50,6 @@
+     newList->head = NULL;
+     newList->tail = NULL;
+     newList->size = 0;
+-    newList->currentIndex = -1;
+     
+     return newList;
+ }
+@@ -80,8 +78,9 @@
+     } else {
+         p->next->previous = p->previous;
+     }
+-    list->curr = NULL;
+-    list->currentIndex = 0;
++    if (p == list->curr) {
++        list->curr = p->next;
++    }
+     --list->size;
+     if (p->forceDelete) {
+         uprv_free(p->data);
+@@ -150,7 +149,6 @@
+         newItem->next = list->head;
+         list->head->previous = newItem;
+         list->head = newItem;
+-        list->currentIndex++;
+     }
+     
+     list->size++;
+@@ -193,7 +191,6 @@
+     
+     curr = list->curr;
+     list->curr = curr->next;
+-    list->currentIndex++;
+     
+     return curr->data;
+ }
+@@ -209,7 +206,6 @@
+ U_CAPI void U_EXPORT2 ulist_resetList(UList *list) {
+     if (list != NULL) {
+         list->curr = list->head;
+-        list->currentIndex = 0;
+     }
+ }
+ 
+@@ -272,4 +268,3 @@
+ U_CAPI UList * U_EXPORT2 ulist_getListFromEnum(UEnumeration *en) {
+     return (UList *)(en->context);
+ }
+-
+diff -Naur icu.old/source/i18n/ucol_res.cpp icu.new/source/i18n/ucol_res.cpp
+--- icu.old/source/i18n/ucol_res.cpp	2016-09-28 04:26:02.000000000 +0200
++++ /icu/source/i18n/ucol_res.cpp	2016-11-15 16:11:10.000596933 +0100
+@@ -680,6 +680,7 @@
+         return NULL;
+     }
+     memcpy(en, &defaultKeywordValues, sizeof(UEnumeration));
++    ulist_resetList(sink.values);  // Initialize the iterator.
+     en->context = sink.values;
+     sink.values = NULL;  // Avoid deletion in the sink destructor.
+     return en;
diff --git a/programming/misc/icu4c/pspec.xml b/programming/misc/icu4c/pspec.xml
index b7669b00fa..41f201bea0 100644
--- a/programming/misc/icu4c/pspec.xml
+++ b/programming/misc/icu4c/pspec.xml
@@ -14,12 +14,12 @@
         <Description>ICU is a mature, widely used set of C/C++ and Java libraries for Unicode support, software internationalization and globalization (i18n/g11n). This package contains the C/C++ libraries.</Description>
         <!-- CAUTION! This package has a great potential to break API/ABI in minor version bumps, check for a file like:
         http://source.icu-project.org/repos/icu/icu/tags/release-55-1/APIChangeReport.html -->
-        <Archive sha1sum="3bb301c11be0e239c653e8aa2925c53f6f4dc88d" type="targz">http://download.icu-project.org/files/icu4c/55.1/icu4c-55_1-src.tgz</Archive>
+        <Archive sha1sum="b67913c90a484c59fda011797c6f3959d84bdc7c" type="targz">http://download.icu-project.org/files/icu4c/58.2/icu4c-58_2-src.tgz</Archive>
         <BuildDependencies>
             <Dependency>libgcc</Dependency>
         </BuildDependencies>
         <Patches>
-        <!--Patch level="3">icu.8198.revert.icu5431.patch</Patch-->
+        <Patch level="3">icu4c-58.2-fix_enumeration-1-1.patch</Patch>
         </Patches>
     </Source>
 
@@ -72,6 +72,13 @@
     </Package>
 
     <History>
+        <Update release="4">
+            <Date>2017-01-31</Date>
+            <Version>58.2</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Ayhan Yalçınsoy</Name>
+            <Email>ayhanyalcinsoy@pisilinux.org</Email>
+        </Update>
         <Update release="3">
             <Date>2016-06-09</Date>
             <Version>55.1</Version>