diff --git a/x11-libs/scintilla/licenses/Scintilla b/x11-libs/scintilla/licenses/Scintilla
index 3f94364b2..0d7ac9170 100644
--- a/x11-libs/scintilla/licenses/Scintilla
+++ b/x11-libs/scintilla/licenses/Scintilla
@@ -17,4 +17,4 @@ SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, 
 WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER 
 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE 
-OR PERFORMANCE OF THIS SOFTWARE.
\ No newline at end of file
+OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/x11-libs/scintilla/scintilla-3.6.0.recipe b/x11-libs/scintilla/scintilla-3.6.0.recipe
index 6fd71f6a4..9ebca2121 100644
--- a/x11-libs/scintilla/scintilla-3.6.0.recipe
+++ b/x11-libs/scintilla/scintilla-3.6.0.recipe
@@ -12,22 +12,15 @@ proportional fonts, bold and italics, multiple foreground and background \
 colours and multiple fonts."
 HOMEPAGE="http://scintilla.org"
 SOURCE_URI="https://prdownloads.sf.net/scintilla/scintilla360.tgz"
-SOURCE_URI_001="https://prdownloads.sf.net/scintilla/scintillahaiku354.tgz"
 CHECKSUM_SHA256="eea7b9118549ab6de0fd8e3108ec2f2597a50e16f2592f54540ecf6407272b1e"
+SOURCE_URI_001="https://prdownloads.sf.net/scintilla/scintillahaiku354.tgz"
 CHECKSUM_SHA256_001="d7cda5041d8bdc8918d2b5be438ec8b95ebf0f0e64b72609244fceb00e543a19"
 SOURCE_DIR="$portName"
-REVISION="1"
+REVISION="2"
 LICENSE="Scintilla"
 COPYRIGHT="1998-2015 Neil Hodgson"
 
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    # x86_gcc2 is fine as primary target architecture as long as we're building
-    # for a different secondary architecture.
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="