diff --git a/aarch64-suse-support.patch b/aarch64-suse-support.patch
index d92ddbc..be8b508 100644
--- a/aarch64-suse-support.patch
+++ b/aarch64-suse-support.patch
@@ -1,7 +1,7 @@
-Index: cfe-3.6.0.src/lib/Driver/ToolChains.cpp
+Index: cfe-3.6.1.src/lib/Driver/ToolChains.cpp
 ===================================================================
---- cfe-3.6.0.src.orig/lib/Driver/ToolChains.cpp
-+++ cfe-3.6.0.src/lib/Driver/ToolChains.cpp
+--- cfe-3.6.1.src.orig/lib/Driver/ToolChains.cpp
++++ cfe-3.6.1.src/lib/Driver/ToolChains.cpp
 @@ -1315,7 +1315,8 @@ bool Generic_GCC::GCCInstallationDetecto
    static const char *const AArch64Triples[] = { "aarch64-none-linux-gnu",
                                                  "aarch64-linux-gnu",
diff --git a/arm_suse_support.diff b/arm_suse_support.diff
index d372efa..b944600 100644
--- a/arm_suse_support.diff
+++ b/arm_suse_support.diff
@@ -1,7 +1,7 @@
-Index: cfe-3.6.0.src/lib/Driver/ToolChains.cpp
+Index: cfe-3.6.1.src/lib/Driver/ToolChains.cpp
 ===================================================================
---- cfe-3.6.0.src.orig/lib/Driver/ToolChains.cpp
-+++ cfe-3.6.0.src/lib/Driver/ToolChains.cpp
+--- cfe-3.6.1.src/lib/Driver/ToolChains.cpp
++++ cfe-3.6.1.src/lib/Driver/ToolChains.cpp
 @@ -1322,9 +1322,11 @@ bool Generic_GCC::GCCInstallationDetecto
  
    static const char *const ARMLibDirs[] = { "/lib" };
diff --git a/assume-opensuse.patch b/assume-opensuse.patch
index e0d1771..faee171 100644
--- a/assume-opensuse.patch
+++ b/assume-opensuse.patch
@@ -1,7 +1,7 @@
-Index: cfe-3.6.0.src/lib/Driver/ToolChains.cpp
+Index: cfe-3.6.1.src/lib/Driver/ToolChains.cpp
 ===================================================================
---- cfe-3.6.0.src/lib/Driver/ToolChains.cpp
-+++ cfe-3.6.0.src/lib/Driver/ToolChains.cpp
+--- cfe-3.6.1.src/lib/Driver/ToolChains.cpp
++++ cfe-3.6.1.src/lib/Driver/ToolChains.cpp
 @@ -2794,6 +2794,7 @@ static bool IsUbuntu(enum Distro Distro)
  }
  
diff --git a/cfe-3.6.0.src.tar.xz b/cfe-3.6.0.src.tar.xz
deleted file mode 100644
index 90cb8fd..0000000
--- a/cfe-3.6.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be0e69378119fe26f0f2f74cffe82b7c26da840c9733fe522ed3c1b66b11082d
-size 8640776
diff --git a/cfe-3.6.1.src.tar.xz b/cfe-3.6.1.src.tar.xz
new file mode 100644
index 0000000..252e77e
--- /dev/null
+++ b/cfe-3.6.1.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:74f92d0c93b86678b015e87655f59474b2f657769680efdeb3c0524ffbd2dad7
+size 8616132
diff --git a/cfe-docs-3.6.0.src.tar.xz b/cfe-docs-3.6.0.src.tar.xz
deleted file mode 100644
index 9143d9b..0000000
--- a/cfe-docs-3.6.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:457015e15728e4ebf7cf7d9f6fd83d1e3cb2a910bffcbc0564a8e41211d96256
-size 1102800
diff --git a/cfe-docs-3.6.1.src.tar.xz b/cfe-docs-3.6.1.src.tar.xz
new file mode 100644
index 0000000..741190e
--- /dev/null
+++ b/cfe-docs-3.6.1.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:18fb328b89f25f0f8e922bb4da223f3f3e667d2ab86ca4522e90d607812a4853
+size 584388
diff --git a/clang-disable-ada-extension.patch b/clang-disable-ada-extension.patch
index 0a3dbc5..204ec46 100644
--- a/clang-disable-ada-extension.patch
+++ b/clang-disable-ada-extension.patch
@@ -1,7 +1,7 @@
-Index: cfe-3.6.0.src/lib/Driver/Types.cpp
+Index: cfe-3.6.1.src/lib/Driver/Types.cpp
 ===================================================================
---- cfe-3.6.0.src/lib/Driver/Types.cpp
-+++ cfe-3.6.0.src/lib/Driver/Types.cpp
+--- cfe-3.6.1.src/lib/Driver/Types.cpp
++++ cfe-3.6.1.src/lib/Driver/Types.cpp
 @@ -158,8 +158,6 @@ types::ID types::lookupTypeForExtension(
             .Case("hh", TY_CXXHeader)
             .Case("ll", TY_LLVM_IR)
diff --git a/clang-resourcedirs.patch b/clang-resourcedirs.patch
index 1de38b0..b632623 100644
--- a/clang-resourcedirs.patch
+++ b/clang-resourcedirs.patch
@@ -1,7 +1,7 @@
-Index: cfe-3.6.0.src/lib/Driver/Driver.cpp
+Index: cfe-3.6.1.src/lib/Driver/Driver.cpp
 ===================================================================
---- cfe-3.6.0.src/lib/Driver/Driver.cpp
-+++ cfe-3.6.0.src/lib/Driver/Driver.cpp
+--- cfe-3.6.1.src/lib/Driver/Driver.cpp
++++ cfe-3.6.1.src/lib/Driver/Driver.cpp
 @@ -64,7 +64,7 @@ Driver::Driver(StringRef ClangExecutable
  
    // Compute the path to the resource directory.
diff --git a/compiler-rt-3.6.0.src.tar.xz b/compiler-rt-3.6.0.src.tar.xz
deleted file mode 100644
index 1dd8c84..0000000
--- a/compiler-rt-3.6.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7f49fb79e5adcdce7dddaf973f1db130228dfb19e37a99a7f5365a6948b26b11
-size 1140616
diff --git a/compiler-rt-3.6.1.src.tar.xz b/compiler-rt-3.6.1.src.tar.xz
new file mode 100644
index 0000000..cc1d7ef
--- /dev/null
+++ b/compiler-rt-3.6.1.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fcbf610c77be6047f11ca10c4725610417beba832565115a9e2fcfe2897b649f
+size 1128460
diff --git a/default-to-i586.patch b/default-to-i586.patch
index 578e545..e2dcf9e 100644
--- a/default-to-i586.patch
+++ b/default-to-i586.patch
@@ -1,7 +1,7 @@
-Index: cfe-3.6.0.src/lib/Driver/Tools.cpp
+Index: cfe-3.6.1.src/lib/Driver/Tools.cpp
 ===================================================================
---- cfe-3.6.0.src/lib/Driver/Tools.cpp
-+++ cfe-3.6.0.src/lib/Driver/Tools.cpp
+--- cfe-3.6.1.src/lib/Driver/Tools.cpp
++++ cfe-3.6.1.src/lib/Driver/Tools.cpp
 @@ -1322,8 +1322,8 @@ static const char *getX86TargetCPU(const
    case llvm::Triple::Bitrig:
      return "i686";
diff --git a/libcxx-3.6.0.src.tar.xz b/libcxx-3.6.0.src.tar.xz
deleted file mode 100644
index 5e414b3..0000000
--- a/libcxx-3.6.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:299c1e82b0086a79c5c1aa1885ea3be3bbce6979aaa9b886409b14f9b387fbb7
-size 946380
diff --git a/libcxx-3.6.1.src.tar.xz b/libcxx-3.6.1.src.tar.xz
new file mode 100644
index 0000000..2fcf102
--- /dev/null
+++ b/libcxx-3.6.1.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5a5c653becf3978d4c4f6095708660855bed691210a9426bb839eecd88b6c0f9
+size 943756
diff --git a/libcxxabi-3.6.0.src.tar.xz b/libcxxabi-3.6.0.src.tar.xz
deleted file mode 100644
index ebf263a..0000000
--- a/libcxxabi-3.6.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f78bcfdb8015272f28d70f5546a544b5bdae5d92862711e8ecb9b24387d994f5
-size 555924
diff --git a/libcxxabi-3.6.1.src.tar.xz b/libcxxabi-3.6.1.src.tar.xz
new file mode 100644
index 0000000..0f7e055
--- /dev/null
+++ b/libcxxabi-3.6.1.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bc8387f420dad9b7e66b708e0a8bf9de9d902c1848fcf6b77244eeb282aff15d
+size 556884
diff --git a/libcxxabi-exceptions.patch b/libcxxabi-exceptions.patch
index 853edc5..e8d3094 100644
--- a/libcxxabi-exceptions.patch
+++ b/libcxxabi-exceptions.patch
@@ -1,7 +1,7 @@
-Index: libcxxabi-3.6.0.src/src/CMakeLists.txt
+Index: libcxxabi-3.6.1.src/src/CMakeLists.txt
 ===================================================================
---- libcxxabi-3.6.0.src/src/CMakeLists.txt
-+++ libcxxabi-3.6.0.src/src/CMakeLists.txt
+--- libcxxabi-3.6.1.src/src/CMakeLists.txt
++++ libcxxabi-3.6.1.src/src/CMakeLists.txt
 @@ -52,7 +52,7 @@ append_if(libraries LIBCXXABI_HAS_PTHREA
  if (LIBCXXABI_USE_LLVM_UNWINDER)
    list(APPEND libraries unwind)
diff --git a/lldb-3.6.0.src.tar.xz b/lldb-3.6.0.src.tar.xz
deleted file mode 100644
index 28ee9f9..0000000
--- a/lldb-3.6.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2b1ad1d42c4ea3fa2f9dd6db7c522d86e80891659b24dbb3d0d80386d8eaf0b2
-size 10429916
diff --git a/lldb-3.6.1.src.tar.xz b/lldb-3.6.1.src.tar.xz
new file mode 100644
index 0000000..9d63324
--- /dev/null
+++ b/lldb-3.6.1.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cefb5c64e78e85ad05a06b80f017ccfe1208b74d3da34eb425c505c6fef9aaba
+size 10401688
diff --git a/lldb-cmake.patch b/lldb-cmake.patch
index d336cd6..5790653 100644
--- a/lldb-cmake.patch
+++ b/lldb-cmake.patch
@@ -1,7 +1,7 @@
-Index: lldb-3.6.0.src/source/lldb.cpp
+Index: lldb-3.6.1.src/source/lldb.cpp
 ===================================================================
---- lldb-3.6.0.src.orig/source/lldb.cpp
-+++ lldb-3.6.0.src/source/lldb.cpp
+--- lldb-3.6.1.src.orig/source/lldb.cpp
++++ lldb-3.6.1.src/source/lldb.cpp
 @@ -325,11 +325,7 @@ extern "C" const unsigned char liblldb_c
  static const char *
  GetLLDBRevision()
@@ -14,10 +14,10 @@ Index: lldb-3.6.0.src/source/lldb.cpp
  }
  
  static const char *
-Index: lldb-3.6.0.src/source/Core/IOHandler.cpp
+Index: lldb-3.6.1.src/source/Core/IOHandler.cpp
 ===================================================================
---- lldb-3.6.0.src.orig/source/Core/IOHandler.cpp
-+++ lldb-3.6.0.src/source/Core/IOHandler.cpp
+--- lldb-3.6.1.src.orig/source/Core/IOHandler.cpp
++++ lldb-3.6.1.src/source/Core/IOHandler.cpp
 @@ -31,8 +31,8 @@
  #include "lldb/Target/ThreadPlan.h"
  
@@ -29,10 +29,10 @@ Index: lldb-3.6.0.src/source/Core/IOHandler.cpp
  #endif
  
  using namespace lldb;
-Index: lldb-3.6.0.src/CMakeLists.txt
+Index: lldb-3.6.1.src/CMakeLists.txt
 ===================================================================
---- lldb-3.6.0.src.orig/CMakeLists.txt
-+++ lldb-3.6.0.src/CMakeLists.txt
+--- lldb-3.6.1.src.orig/CMakeLists.txt
++++ lldb-3.6.1.src/CMakeLists.txt
 @@ -83,7 +83,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
  
    # Import CMake library targets from LLVM and Clang.
@@ -42,10 +42,10 @@ Index: lldb-3.6.0.src/CMakeLists.txt
  
    set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
  
-Index: lldb-3.6.0.src/cmake/LLDBDependencies.cmake
+Index: lldb-3.6.1.src/cmake/LLDBDependencies.cmake
 ===================================================================
---- lldb-3.6.0.src.orig/cmake/LLDBDependencies.cmake
-+++ lldb-3.6.0.src/cmake/LLDBDependencies.cmake
+--- lldb-3.6.1.src.orig/cmake/LLDBDependencies.cmake
++++ lldb-3.6.1.src/cmake/LLDBDependencies.cmake
 @@ -132,7 +132,7 @@ set( CLANG_USED_LIBS
  
  set(LLDB_SYSTEM_LIBS)
diff --git a/lldb.changes b/lldb.changes
index 8bfa4a9..4fdc5fa 100644
--- a/lldb.changes
+++ b/lldb.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 25 13:59:56 UTC 2015 - idonmez@suse.com
+
+- Update to version 3.6.1
+  * No changelog upstream
+
 -------------------------------------------------------------------
 Mon Mar  2 10:14:22 UTC 2015 - idonmez@suse.com
 
diff --git a/lldb.spec b/lldb.spec
index ee3332b..05121a4 100644
--- a/lldb.spec
+++ b/lldb.spec
@@ -16,10 +16,10 @@
 #
 
 
-%define _revision       230777
+%define _revision 238133
 
 Name:           lldb
-Version:        3.6.0
+Version:        3.6.1
 Release:        0
 Summary:        The LLDB Debugger
 License:        NCSA
diff --git a/llvm-3.6.0.src.tar.xz b/llvm-3.6.0.src.tar.xz
deleted file mode 100644
index cdf8f8b..0000000
--- a/llvm-3.6.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b39a69e501b49e8f73ff75c9ad72313681ee58d6f430bfad4d81846fe92eb9ce
-size 12750908
diff --git a/llvm-3.6.1.src.tar.xz b/llvm-3.6.1.src.tar.xz
new file mode 100644
index 0000000..e504c76
--- /dev/null
+++ b/llvm-3.6.1.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f00c615913aa0b56607ee1548936e60ad2aa89e6d56f23fb032a4463366fc7a
+size 12798852
diff --git a/llvm-docs-3.6.0.src.tar.xz b/llvm-docs-3.6.0.src.tar.xz
deleted file mode 100644
index 1e9cd78..0000000
--- a/llvm-docs-3.6.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:49a2e6215410404a2c257ca85189fb97036531696ef39c995f067f8359767078
-size 1440100
diff --git a/llvm-docs-3.6.1.src.tar.xz b/llvm-docs-3.6.1.src.tar.xz
new file mode 100644
index 0000000..a58801d
--- /dev/null
+++ b/llvm-docs-3.6.1.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1089067449b10f4dcfe88b599772f13ef223a1111681b4193d4438e24b5ae9fe
+size 1442296
diff --git a/llvm-fix-find-gcc5-install.patch b/llvm-fix-find-gcc5-install.patch
index d122e99..7ad07f5 100644
--- a/llvm-fix-find-gcc5-install.patch
+++ b/llvm-fix-find-gcc5-install.patch
@@ -1,7 +1,7 @@
-Index: cfe-3.6.0.src/lib/Driver/ToolChains.cpp
+Index: cfe-3.6.1.src/lib/Driver/ToolChains.cpp
 ===================================================================
---- cfe-3.6.0.src/lib/Driver/ToolChains.cpp.orig	2015-02-20 14:03:49.512242844 +0100
-+++ cfe-3.6.0.src/lib/Driver/ToolChains.cpp	2015-02-20 15:07:11.965048162 +0100
+--- cfe-3.6.1.src/lib/Driver/ToolChains.cpp.orig	2015-02-20 14:03:49.512242844 +0100
++++ cfe-3.6.1.src/lib/Driver/ToolChains.cpp	2015-02-20 15:07:11.965048162 +0100
 @@ -1135,10 +1135,11 @@ Generic_GCC::GCCVersion Linux::GCCVersio
        GoodVersion.Major < 0)
      return BadVersion;
diff --git a/llvm-fix-parsearmarch.patch b/llvm-fix-parsearmarch.patch
index f014230..efc4c86 100644
--- a/llvm-fix-parsearmarch.patch
+++ b/llvm-fix-parsearmarch.patch
@@ -1,7 +1,7 @@
-Index: llvm-3.6.0.src/lib/Support/Triple.cpp
+Index: llvm-3.6.1.src/lib/Support/Triple.cpp
 ===================================================================
---- llvm-3.6.0.src.orig/lib/Support/Triple.cpp
-+++ llvm-3.6.0.src/lib/Support/Triple.cpp
+--- llvm-3.6.1.src.orig/lib/Support/Triple.cpp
++++ llvm-3.6.1.src/lib/Support/Triple.cpp
 @@ -270,9 +270,9 @@ static Triple::ArchType parseARMArch(Str
      .Cases("v3", "v3m", isThumb ? Triple::UnknownArch : arch)
      .Cases("v4", "v4t", arch)
diff --git a/llvm-remove-clang-only-flags.patch b/llvm-remove-clang-only-flags.patch
index a625e03..56cb6e2 100644
--- a/llvm-remove-clang-only-flags.patch
+++ b/llvm-remove-clang-only-flags.patch
@@ -1,7 +1,7 @@
-Index: llvm-3.6.0.src/cmake/modules/HandleLLVMOptions.cmake
+Index: llvm-3.6.1.src/cmake/modules/HandleLLVMOptions.cmake
 ===================================================================
---- llvm-3.6.0.src.orig/cmake/modules/HandleLLVMOptions.cmake
-+++ llvm-3.6.0.src/cmake/modules/HandleLLVMOptions.cmake
+--- llvm-3.6.1.src.orig/cmake/modules/HandleLLVMOptions.cmake
++++ llvm-3.6.1.src/cmake/modules/HandleLLVMOptions.cmake
 @@ -302,9 +302,6 @@ elseif( LLVM_COMPILER_IS_GCC_COMPATIBLE
      endif()
    endif (LLVM_ENABLE_WARNINGS)
diff --git a/llvm.changes b/llvm.changes
index 870b5fe..2bb85fa 100644
--- a/llvm.changes
+++ b/llvm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 25 13:59:37 UTC 2015 - idonmez@suse.com
+
+- Update to version 3.6.1
+  * No changelog upstream
+
 -------------------------------------------------------------------
 Fri Apr 24 12:19:33 UTC 2015 - idonmez@suse.com
 
diff --git a/llvm.spec b/llvm.spec
index 37fa436..a70697a 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -16,8 +16,8 @@
 #
 
 
-%define _revision       230777
-%define _release_version 3.6.0
+%define _revision 238133
+%define _release_version 3.6.1
 
 %define build_libcxx 0
 
@@ -26,7 +26,7 @@
 %endif
 
 Name:           llvm
-Version:        3.6.0
+Version:        3.6.1
 Release:        0
 Summary:        Low Level Virtual Machine
 License:        NCSA
@@ -41,7 +41,7 @@ Source4:        http://llvm.org/releases/%{version}/libcxxabi-%{version}.src.tar
 # cd docs
 # make -f Makefile.sphinx man html
 # cd ..
-# tar cvJf llvm-docs-3.6.0.src.tar.xz llvm-3.6.0.src/docs/_build/{man,html}
+# tar cvJf llvm-docs-3.6.1.src.tar.xz llvm-3.6.1.src/docs/_build/{man,html}
 Source5:        llvm-docs-%{version}.src.tar.xz
 Source6:        cfe-docs-%{version}.src.tar.xz
 Source100:      %{name}-rpmlintrc
diff --git a/set-revision.patch b/set-revision.patch
index 6715df4..f7bac91 100644
--- a/set-revision.patch
+++ b/set-revision.patch
@@ -1,7 +1,7 @@
-Index: cfe-3.6.0.src/lib/Basic/Version.cpp
+Index: cfe-3.6.1.src/lib/Basic/Version.cpp
 ===================================================================
---- cfe-3.6.0.src/lib/Basic/Version.cpp
-+++ cfe-3.6.0.src/lib/Basic/Version.cpp
+--- cfe-3.6.1.src/lib/Basic/Version.cpp
++++ cfe-3.6.1.src/lib/Basic/Version.cpp
 @@ -66,19 +66,11 @@ std::string getLLVMRepositoryPath() {
  }